From c32f00d73f112ddbfb2bea91cc4801d19dfea3e6 Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Wed, 7 Jul 2021 11:54:00 -0500 Subject: [PATCH 001/300] Updating/re-enabling skipped/xfailed Dynamic Vegetation automated tests Signed-off-by: jckand-amzn --- .../hydra_test_utils.py | 6 ++--- .../AltitudeFilter_FilterStageToggle.py | 24 +++---------------- ...ynamicSliceInstanceSpawner_Embedded_E2E.py | 19 ++++++--------- ...ynamicSliceInstanceSpawner_External_E2E.py | 23 +++++++----------- .../test_DynamicSliceInstanceSpawner.py | 2 -- .../editor_dynveg_test_helper.py | 4 ++-- 6 files changed, 24 insertions(+), 54 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py index 2583109573..bb71d30d98 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py @@ -89,7 +89,7 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc :return: True if port is listening. """ port_listening = False - for conn in psutil.net_connections(): + for conn in process_utils.psutil.net_connections(): if 'port={}'.format(port) in str(conn): port_listening = True return port_listening @@ -110,8 +110,8 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc # Load the specified level in the launcher send_command_and_expect_response(remote_console_instance, - f"map {level}", - "LEVEL_LOAD_COMPLETE", timeout=30) + f"LoadLevel {level}", + "LEVEL_LOAD_END", timeout=30) # Monitor the console for expected lines for line in expected_lines: diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py index bbdb925585..2fac361ced 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/AltitudeFilter_FilterStageToggle.py @@ -36,8 +36,8 @@ class TestAltitudeFilterFilterStageToggle(EditorTestHelper): :return: None """ - PREPROCESS_INSTANCE_COUNT = 24 - POSTPROCESS_INSTANCE_COUNT = 18 + PREPROCESS_INSTANCE_COUNT = 44 + POSTPROCESS_INSTANCE_COUNT = 34 # Create empty level self.test_success = self.create_level( @@ -62,25 +62,7 @@ class TestAltitudeFilterFilterStageToggle(EditorTestHelper): dynveg.create_surface_entity("Surface_Entity_Parent", position, 16.0, 16.0, 1.0) # Add entity with Mesh to replicate creation of hills - hill_entity = dynveg.create_mesh_surface_entity_with_slopes("hill", position, 40.0, 40.0, 40.0) - - # Disable/Re-enable Mesh component due to ATOM-14299 - general.idle_wait(1.0) - editor.EditorComponentAPIBus(bus.Broadcast, 'DisableComponents', [hill_entity.components[0]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', hill_entity.components[0]) - if is_enabled: - print("Mesh component is still enabled") - else: - print("Mesh component was disabled") - editor.EditorComponentAPIBus(bus.Broadcast, 'EnableComponents', [hill_entity.components[0]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', hill_entity.components[0]) - if is_enabled: - print("Mesh component is now enabled") - else: - print("Mesh component is still disabled") - - # Increase Box Shape size to encompass the hills - vegetation.get_set_test(1, "Box Shape|Box Configuration|Dimensions", math.Vector3(100.0, 100.0, 100.0)) + hill_entity = dynveg.create_mesh_surface_entity_with_slopes("hill", position, 10.0) # Set a Min Altitude of 38 and Max of 40 in Vegetation Altitude Filter vegetation.get_set_test(3, "Configuration|Altitude Min", 38.0) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py index 4b0951acaf..6a99979a1f 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_Embedded_E2E.py @@ -9,9 +9,10 @@ import sys sys.path.append(os.path.dirname(os.path.abspath(__file__))) import azlmbr.asset as asset +import azlmbr.components as components import azlmbr.legacy.general as general import azlmbr.bus as bus -import azlmbr.entity as EntityId +import azlmbr.entity as entity import azlmbr.editor as editor import azlmbr.math as math import azlmbr.paths @@ -83,18 +84,12 @@ class TestDynamicSliceInstanceSpawnerEmbeddedEditor(EditorTestHelper): self.log(f"Expected {num_expected_instances} instances - Found {num_found} instances") self.test_success = self.test_success and num_found == num_expected_instances - # 5) Create a new entity with a Camera component for testing in the launcher + # 5) Move the default Camera entity for testing in the launcher cam_position = math.Vector3(512.0, 500.0, 35.0) - camera_component = ["Camera"] - new_entity_id2 = editor.ToolsApplicationRequestBus( - bus.Broadcast, "CreateNewEntityAtPosition", cam_position, EntityId.EntityId() - ) - if new_entity_id2.IsValid(): - self.log("Camera entity created") - camera_entity = hydra.Entity("Camera Entity", new_entity_id2) - camera_entity.components = [] - for component in camera_component: - camera_entity.components.append(hydra.add_component(component, new_entity_id2)) + search_filter = entity.SearchFilter() + search_filter.names = ["Camera"] + search_entity_ids = entity.SearchBus(bus.Broadcast, 'SearchEntities', search_filter) + components.TransformBus(bus.Event, "MoveEntity", search_entity_ids[0], cam_position) # 6) Save and export to engine general.save_level() diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py index 892549d414..70030ff359 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/DynamicSliceInstanceSpawner_External_E2E.py @@ -11,7 +11,8 @@ sys.path.append(os.path.dirname(os.path.abspath(__file__))) import azlmbr.legacy.general as general import azlmbr.asset as asset import azlmbr.bus as bus -import azlmbr.entity as EntityId +import azlmbr.components as components +import azlmbr.entity as entity import azlmbr.editor as editor import azlmbr.math as math import azlmbr.paths @@ -68,7 +69,7 @@ class TestDynamicSliceInstanceSpawnerExternalEditor(EditorTestHelper): veg_area_required_components = ["Vegetation Layer Spawner", "Box Shape", "Vegetation Asset List", "Script Canvas"] new_entity_id = editor.ToolsApplicationRequestBus( - bus.Broadcast, "CreateNewEntityAtPosition", entity_position, EntityId.EntityId() + bus.Broadcast, "CreateNewEntityAtPosition", entity_position, entity.EntityId() ) if new_entity_id.IsValid(): self.log("Spawner entity created") @@ -106,18 +107,12 @@ class TestDynamicSliceInstanceSpawnerExternalEditor(EditorTestHelper): self.log(f"Expected {num_expected_instances} instances - Found {num_found} instances") self.test_success = self.test_success and num_found == num_expected_instances - # 5) Create a new entity with a Camera component for testing in the launcher - entity_position = math.Vector3(512.0, 500.0, 35.0) - camera_component = ["Camera"] - new_entity_id2 = editor.ToolsApplicationRequestBus( - bus.Broadcast, "CreateNewEntityAtPosition", entity_position, EntityId.EntityId() - ) - if new_entity_id2.IsValid(): - self.log("Camera entity created") - camera_entity = hydra.Entity("Camera Entity", new_entity_id2) - camera_entity.components = [] - for component in camera_component: - camera_entity.components.append(hydra.add_component(component, new_entity_id2)) + # 5) Move the default Camera entity for testing in the launcher + cam_position = math.Vector3(512.0, 500.0, 35.0) + search_filter = entity.SearchFilter() + search_filter.names = ["Camera"] + search_entity_ids = entity.SearchBus(bus.Broadcast, 'SearchEntities', search_filter) + components.TransformBus(bus.Event, "MoveEntity", search_entity_ids[0], cam_position) # 6) Save and export to engine general.save_level() diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py index 053c4ccbfd..eb74a5a144 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_DynamicSliceInstanceSpawner.py @@ -90,7 +90,6 @@ class TestDynamicSliceInstanceSpawner(object): @pytest.mark.SUITE_periodic @pytest.mark.dynveg_area @pytest.mark.parametrize("launcher_platform", ['windows']) - @pytest.mark.skip # ATOM-14703 def test_DynamicSliceInstanceSpawner_Embedded_E2E_Launcher(self, workspace, launcher, level, remote_console_instance, project, launcher_platform): @@ -126,7 +125,6 @@ class TestDynamicSliceInstanceSpawner(object): @pytest.mark.SUITE_periodic @pytest.mark.dynveg_area @pytest.mark.parametrize("launcher_platform", ['windows']) - @pytest.mark.skip # ATOM-14703 def test_DynamicSliceInstanceSpawner_External_E2E_Launcher(self, workspace, launcher, level, remote_console_instance, project, launcher_platform): diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py index 515009cb3a..09d4746fa6 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/large_worlds_utils/editor_dynveg_test_helper.py @@ -34,7 +34,7 @@ def create_surface_entity(name, center_point, box_size_x, box_size_y, box_size_z return surface_entity -def create_mesh_surface_entity_with_slopes(name, center_point, scale_x, scale_y, scale_z): +def create_mesh_surface_entity_with_slopes(name, center_point, uniform_scale): # Creates an entity with the assigned mesh_asset as the specified scale and sets up as a planting surface mesh_asset_path = os.path.join("models", "sphere.azmodel") mesh_asset = asset.AssetCatalogRequestBus(bus.Broadcast, "GetAssetIdByPath", mesh_asset_path, math.Uuid(), @@ -47,7 +47,7 @@ def create_mesh_surface_entity_with_slopes(name, center_point, scale_x, scale_y, if surface_entity.id.IsValid(): print(f"'{surface_entity.name}' created") hydra.get_set_test(surface_entity, 0, "Controller|Configuration|Mesh Asset", mesh_asset) - components.TransformBus(bus.Event, "SetLocalScale", surface_entity.id, math.Vector3(scale_x, scale_y, scale_z)) + components.TransformBus(bus.Event, "SetLocalUniformScale", surface_entity.id, uniform_scale) return surface_entity From bd5226aac56a6ffe8e05c028e775945e6f591606 Mon Sep 17 00:00:00 2001 From: kberg-amzn Date: Wed, 7 Jul 2021 10:41:44 -0700 Subject: [PATCH 002/300] Changes to fix rewindable attributes incorrectly used on read-only archetype data, fix some bad logic in the pre-render blending code, adding a serializer for AZ::Transform, and adding our client.cfg and server.cfg files to .gitignore Signed-off-by: kberg-amzn --- .gitignore | 2 ++ .../Serialization/AzContainerSerializers.h | 18 ++++++++++++++++++ .../Source/AutoGen/AutoComponent_Header.jinja | 18 +++++++++--------- .../Source/AutoGen/AutoComponent_Source.jinja | 10 +--------- ...NetworkTransformComponent.AutoComponent.xml | 5 ----- .../Code/Source/MultiplayerSystemComponent.cpp | 12 +++++------- 6 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.gitignore b/.gitignore index 664680c5bf..654b839155 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,8 @@ UserSettings.xml FrameCapture/** .DS_Store user*.cfg +client*.cfg +server*.cfg .mayaSwatches/ _savebackup/ #Output folder for test results when running Automated Tests diff --git a/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h b/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h index 25b1543b1f..107d0068fb 100644 --- a/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h +++ b/Code/Framework/AzNetworking/AzNetworking/Serialization/AzContainerSerializers.h @@ -302,4 +302,22 @@ namespace AzNetworking return serializer.IsValid(); } }; + + template <> + struct SerializeObjectHelper + { + static bool SerializeObject(ISerializer& serializer, AZ::Transform& value) + { + AZ::Vector3 translation = value.GetTranslation(); + AZ::Quaternion rotation = value.GetRotation(); + float uniformScale = value.GetUniformScale(); + serializer.Serialize(translation, "Translation"); + serializer.Serialize(rotation, "Rotation"); + serializer.Serialize(uniformScale, "Scale"); + value.SetTranslation(translation); + value.SetRotation(rotation); + value.SetUniformScale(uniformScale); + return serializer.IsValid(); + } + }; } diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja index 79fbb4a99e..4fe2f6291c 100644 --- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja +++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Header.jinja @@ -8,22 +8,22 @@ {% set PropertyName = UpperFirst(Property.attrib['Name']) %} {% if Property.attrib['Container'] == 'Array' %} {% if Property.attrib['IsRewindable']|booleanTrue %} -const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Array() const; +const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Array() const; {% else %} -const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Array() const; +const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Array() const; {% endif %} -const {{ Property.attrib['Type'] }} &Get{{ PropertyName }}(int32_t index) const; +const {{ Property.attrib['Type'] }}& Get{{ PropertyName }}(int32_t index) const; {% if Property.attrib['GenerateEventBindings']|booleanTrue %} void {{ PropertyName }}AddEvent(AZ::Event::Handler& handler); {% endif %} {% elif Property.attrib['Container'] == 'Vector' %} {% if Property.attrib['IsRewindable']|booleanTrue %} -const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Vector() const; +const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Vector() const; {% else %} -const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}> &Get{{ PropertyName }}Vector() const; +const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& Get{{ PropertyName }}Vector() const; {% endif %} -const {{ Property.attrib['Type'] }} &Get{{ PropertyName }}(int32_t index) const; -const {{ Property.attrib['Type'] }} &{{ PropertyName }}GetBack() const; +const {{ Property.attrib['Type'] }}& Get{{ PropertyName }}(int32_t index) const; +const {{ Property.attrib['Type'] }}& {{ PropertyName }}GetBack() const; uint32_t {{ PropertyName }}GetSize() const; {% if Property.attrib['GenerateEventBindings']|booleanTrue %} void {{ PropertyName }}AddEvent(AZ::Event::Handler& handler); @@ -63,7 +63,7 @@ void Set{{ PropertyName }}(const {{ Property.attrib['Type'] }}& value); {% macro DeclareNetworkPropertyGetters(Component, ReplicateFrom, ReplicateTo, IsProtected) %} {% call(Property) AutoComponentMacros.ParseNetworkProperties(Component, ReplicateFrom, ReplicateTo) %} {% set PropertyName = UpperFirst(Property.attrib['Name']) %} -{% if Property.attrib['IsPublic'] | booleanTrue != IsProtected %} +{% if Property.attrib['IsPublic']|booleanTrue != IsProtected %} //! {{ PropertyName }} Accessors //! {{ Property.attrib['Description'] }}. {{ DeclareNetworkPropertyGetter(Property) }} @@ -105,7 +105,7 @@ const {{ Property.attrib['Type'] }}& Get{{ PropertyName }}() const; {% macro DeclareNetworkPropertyAccessors(Component, ReplicateFrom, ReplicateTo, IsProtected) %} {% call(Property) AutoComponentMacros.ParseNetworkProperties(Component, ReplicateFrom, ReplicateTo) %} {% set PropertyName = UpperFirst(Property.attrib['Name']) %} -{% if Property.attrib['IsPublic'] | booleanTrue != IsProtected %} +{% if Property.attrib['IsPublic']|booleanTrue != IsProtected %} //! {{ PropertyName }} Accessors //! {{ Property.attrib['Description'] }}. {{ DeclareNetworkPropertyGetter(Property) -}} diff --git a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja index c34c639cd9..f1c7098c19 100644 --- a/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja +++ b/Gems/Multiplayer/Code/Source/AutoGen/AutoComponent_Source.jinja @@ -507,7 +507,7 @@ case {{ UpperFirst(Component.attrib['Name']) }}Internal::RemoteProcedure::{{ Upp {% endif %} } {% else %} - Handle{{ UpperFirst(Property.attrib['Name']) }}({{ ', '.join(rpcParamList) }}); + Handle{{ UpperFirst(Property.attrib['Name']) }}(invokingConnection, {{ ', '.join(rpcParamList) }}); {% endif %} } else if (paramsSerialized) @@ -712,11 +712,7 @@ void {{ ClassName }}::NotifyChanges{{ AutoComponentMacros.GetNetPropertiesSetNam {% macro DefineArchetypePropertyGet(Property, ClassType, ClassName, Prefix = '') %} {% if ClassType == '' or Property.attrib['ExportTo'] == ClassType or Property.attrib['ExportTo'] == "Common" %} {% if Property.attrib['Container'] == 'Array' %} -{% if Property.attrib['IsRewindable']|booleanTrue %} -const RewindableArray<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const -{% else %} const AZStd::array<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Array() const -{% endif %} { return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }}; } @@ -727,11 +723,7 @@ const {{ Property.attrib['Type'] }}& {{ ClassName }}::Get{{ UpperFirst(Property. } {% elif Property.attrib['Container'] == 'Vector' %} -{% if Property.attrib['IsRewindable']|booleanTrue %} -const RewindableFixedVector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const -{% else %} const AZStd::fixed_vector<{{ Property.attrib['Type'] }}, {{ Property.attrib['Count'] }}>& {{ ClassName }}::Get{{ UpperFirst(Property.attrib['Name']) }}Vector() const -{% endif %} { return {{ Prefix }}m_{{ LowerFirst(Property.attrib['Name']) }}; } diff --git a/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml b/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml index 8abc874aa6..cec005cc26 100644 --- a/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml +++ b/Gems/Multiplayer/Code/Source/AutoGen/NetworkTransformComponent.AutoComponent.xml @@ -18,9 +18,4 @@ - - diff --git a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp index 012eca1e89..93f655af0c 100644 --- a/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp +++ b/Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp @@ -847,12 +847,10 @@ namespace Multiplayer void MultiplayerSystemComponent::TickVisibleNetworkEntities(float deltaTime, float serverRateSeconds) { - const float targetAdjustBlend = AZStd::clamp(deltaTime / serverRateSeconds, 0.0f, 1.0f); - m_renderBlendFactor += targetAdjustBlend; - // Linear close to the origin, but asymptote at y = 1 - const float adjustedBlendFactor = 1.0f - (std::pow(0.2f, m_renderBlendFactor)); - AZLOG(NET_Blending, "Computed blend factor of %f", adjustedBlendFactor); + const float targetAdjustBlend = AZStd::clamp(deltaTime / serverRateSeconds, 0.0f, 1.0f); + m_renderBlendFactor = 1.0f - (std::pow(0.2f, m_renderBlendFactor + targetAdjustBlend)); + AZLOG(NET_Blending, "Computed blend factor of %0.2f using a frametime of %0.2f and a serverTickRate of %0.2f", m_renderBlendFactor, deltaTime, serverRateSeconds); if (Camera::ActiveCameraRequestBus::HasHandlers()) { @@ -895,7 +893,7 @@ namespace Multiplayer for (NetBindComponent* netBindComponent : gatheredEntities) { - netBindComponent->NotifyPreRender(deltaTime, adjustedBlendFactor); + netBindComponent->NotifyPreRender(deltaTime, m_renderBlendFactor); } } else @@ -907,7 +905,7 @@ namespace Multiplayer NetBindComponent* netBindComponent = entity->FindComponent(); if (netBindComponent != nullptr) { - netBindComponent->NotifyPreRender(deltaTime, adjustedBlendFactor); + netBindComponent->NotifyPreRender(deltaTime, m_renderBlendFactor); } } } From 78752a23a76bf6b8d3f172a5c8cf6d90828e2417 Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Wed, 7 Jul 2021 14:30:24 -0500 Subject: [PATCH 003/300] Updating null renderer argument for launcher tests Signed-off-by: jckand-amzn --- .../editor_python_test_tools/hydra_test_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py index bb71d30d98..343eb5b12d 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py @@ -95,7 +95,7 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc return port_listening if null_renderer: - launcher.args.extend(["-NullRenderer"]) + launcher.args.extend(["-rhi=Null"]) # Start the Launcher with launcher.start(): From 0a68bbdf7ce830d8cf4a09da8037354d648c6b86 Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Wed, 7 Jul 2021 15:28:55 -0500 Subject: [PATCH 004/300] Updating camera position and null renderer args for launcher test Signed-off-by: jckand-amzn --- .../EditorScripts/LayerBlender_E2E_Editor.py | 26 +++++++------------ .../largeworlds/dyn_veg/test_LayerBlender.py | 4 +-- 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py index c4dfbbf4fe..3543b4c23c 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerBlender_E2E_Editor.py @@ -18,9 +18,9 @@ import azlmbr.areasystem as areasystem import azlmbr.legacy.general as general import azlmbr import azlmbr.bus as bus -import azlmbr.editor as editor +import azlmbr.components as components import azlmbr.math as math -import azlmbr.entity as EntityId +import azlmbr.entity as entity import azlmbr.paths sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) @@ -134,20 +134,14 @@ class TestVegLayerBlenderCreated(EditorTestHelper): purple_count += 1 self.test_success = pink_count == purple_count and (pink_count + purple_count == num_expected) and self.test_success - # 5) Create a new entity with a Camera component for testing in the launcher - entity_position = math.Vector3(500.0, 500.0, 47.0) - rot_degrees_vector = math.Vector3(radians(-55.0), radians(28.5), radians(-17.0)) - camera_component = ["Camera"] - camera_id = editor.ToolsApplicationRequestBus( - bus.Broadcast, "CreateNewEntityAtPosition", entity_position, EntityId.EntityId() - ) - if camera_id.IsValid(): - self.log("Camera entity created") - camera_entity = hydra.Entity("Camera Entity", camera_id) - camera_entity.components = [] - for component in camera_component: - camera_entity.components.append(hydra.add_component(component, camera_id)) - azlmbr.components.TransformBus(bus.Event, "SetLocalRotation", camera_id, rot_degrees_vector) + # 5) Move the default Camera entity for testing in the launcher + cam_position = math.Vector3(500.0, 500.0, 47.0) + cam_rot_degrees_vector = math.Vector3(radians(-55.0), radians(28.5), radians(-17.0)) + search_filter = entity.SearchFilter() + search_filter.names = ["Camera"] + search_entity_ids = entity.SearchBus(bus.Broadcast, 'SearchEntities', search_filter) + components.TransformBus(bus.Event, "MoveEntity", search_entity_ids[0], cam_position) + azlmbr.components.TransformBus(bus.Event, "SetLocalRotation", search_entity_ids[0], cam_rot_degrees_vector) # 6) Save and export level general.save_level() diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py index 3c16420a30..2620a7d50a 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerBlender.py @@ -68,7 +68,6 @@ class TestLayerBlender(object): "Entity has a Box Shape component", "Blender Configuration|Vegetation Areas: SUCCESS", "Blender Box Shape|Box Configuration|Dimensions: SUCCESS", - "Camera entity created", "LayerBlender_E2E_Editor: result=SUCCESS" ] @@ -85,12 +84,11 @@ class TestLayerBlender(object): @pytest.mark.BAT @pytest.mark.SUITE_periodic @pytest.mark.dynveg_area - @pytest.mark.xfail @pytest.mark.parametrize("launcher_platform", ['windows']) def test_LayerBlender_E2E_Launcher(self, workspace, project, launcher, level, remote_console_instance, launcher_platform): - launcher.args.extend(["-NullRenderer"]) + launcher.args.extend(["-rhi=Null"]) launcher.start() assert launcher.is_alive(), "Launcher failed to start" From 6308d01456252a1a12b23c844a8235ef93b07252 Mon Sep 17 00:00:00 2001 From: evanchia Date: Wed, 30 Jun 2021 15:29:06 -0700 Subject: [PATCH 005/300] Minor changes to system example test to match docs Signed-off-by: evanchia --- .../tests/example/test_system_example.py | 94 +++++++++---------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/Tools/LyTestTools/tests/example/test_system_example.py b/Tools/LyTestTools/tests/example/test_system_example.py index 3cb6128802..c4f4812428 100755 --- a/Tools/LyTestTools/tests/example/test_system_example.py +++ b/Tools/LyTestTools/tests/example/test_system_example.py @@ -3,7 +3,7 @@ Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright SPDX-License-Identifier: Apache-2.0 OR MIT -Example test using LyTestTools to test Lumberyard. +Example test using LyTestTools to test Open 3D Engine. """ # Python built-in dependencies. import logging @@ -11,7 +11,7 @@ import logging # Third party dependencies. import pytest -# ly_test_tools dependencies. +# Optional ly_test_tools dependencies. import ly_test_tools.log.log_monitor import ly_remote_console.remote_console_commands as remote_console_commands @@ -22,28 +22,6 @@ import ly_remote_console.remote_console_commands as remote_console_commands logger = logging.getLogger(__name__) -@pytest.fixture -def remote_console(request): - """ - Creates a RemoteConsole() class instance to send console commands to the - Lumberyard client console. - :param request: _pytest.fixtures.SubRequest class that handles getting - a pytest fixture from a pytest function/fixture. - :return: ly_remote_console.remote_console_commands.RemoteConsole class instance - representing the Lumberyard remote console executable. - """ - # Initialize the RemoteConsole object to send commands to the Lumberyard client console. - console = remote_console_commands.RemoteConsole() - - # Custom teardown method for this remote_console fixture. - def teardown(): - console.stop() - - # Utilize request.addfinalizer() to add custom teardown() methods. - request.addfinalizer(teardown) # This pattern must be used in pytest version - - return console - # Shared parameters & fixtures for all test methods inside the TestSystemExample class. @pytest.mark.usefixtures("automatic_process_killer") @pytest.mark.parametrize('project', ['AutomatedTesting']) @@ -55,6 +33,41 @@ class TestSystemExample(object): For this test, we placed unique test values in test methods and shared test values in the test class. We also assume building has already been done, but the test should error if the build is mis-configured. """ + + # This test method only needs pytest.mark report values and shared test class parameters. + @pytest.mark.parametrize('processes_to_kill', ['Editor.exe']) + @pytest.mark.parametrize("launcher_platform", ['windows_editor']) + def test_SystemTestExample_WindowsPlatform_LaunchEditor(self, editor, processes_to_kill, launcher_platform): + """ + Tests launching the O3DE Editor is successful with the current build. + """ + # Launch the O3DE Editor & verify load is successful: + with editor.start(): + assert editor.is_alive(), ( + 'Editor failed to launch for the current O3DE build.') + + @pytest.fixture + def remote_console(request): + """ + Creates a RemoteConsole() class instance to send console commands to the + O3DE client console. + :param request: _pytest.fixtures.SubRequest class that handles getting + a pytest fixture from a pytest function/fixture. + :return: ly_remote_console.remote_console_commands.RemoteConsole class instance + representing the O3DE Remote Console executable. + """ + # Initialize the RemoteConsole object to send commands to the O3DE client console. + console = remote_console_commands.RemoteConsole() + + # Custom teardown method for this remote_console fixture. + def teardown(): + console.stop() + + # Utilize request.addfinalizer() to add custom teardown() methods. + request.addfinalizer(teardown) # This pattern must be used in pytest version + + return console + # This test method needs specific parameters not shared by all other tests in the class. # For targeting specific launchers, use the 'launcher_platform' pytest param like below: # @pytest.mark.parametrize("launcher_platform", ['android']) @@ -62,39 +75,24 @@ class TestSystemExample(object): # @pytest.mark.parametrize("asset_processor_platform", ['android']) @pytest.mark.parametrize('level', ['simple_jacklocomotion']) @pytest.mark.parametrize('load_wait', [120]) - @pytest.mark.test_case_id('C16806863') - def test_SystemTestExample_AllSupportedPlatforms_LaunchAutomatedTesting( - # launcher_platform, asset_processor_platform, # Re-add these here if you plan to use them. - self, launcher, remote_console, level, load_wait): + def test_SystemTestExample_AllSupportedPlatforms_LaunchAutomatedTesting(self, launcher, remote_console, level, + load_wait): """ - Tests launching the AutomatedTesting then launches the Lumberyard client & + Tests launching the AutomatedTesting then launches the O3DE client & loads the "simple_jacklocomotion" level using the remote console. Assumes the user already setup & built their machine for the test. """ - # Launch the Lumberyard client & remote console test case: + # Launch the O3DE client & remote console test case: with launcher.start(): remote_console.start() + # Wait for the expected log line to appear launcher_load = remote_console.expect_log_line( match_string='Level system is loading "simple_jacklocomotion"', timeout=load_wait) # Assert loading was successful using remote console logs: - assert launcher_load, ( - 'Launcher failed to load Lumberyard client with the ' - f'"{level}" level - waited "{load_wait}" seconds.') - - # This test method only needs pytest.mark report values and shared test class parameters. - @pytest.mark.parametrize('processes_to_kill', ['Editor.exe']) - @pytest.mark.parametrize("launcher_platform", ['windows_editor']) - @pytest.mark.test_case_id('C16806864') - def test_SystemTestExample_AllSupportedPlatforms_LaunchEditor(self, editor, processes_to_kill, launcher_platform): - """ - Tests launching the Lumberyard Editor is successful with the current build. - """ - # Launch the Lumberyard editor & verify load is successful: - with editor.start(): - assert editor.is_alive(), ( - 'Editor failed to launch for the current Lumberyard build.') + assert launcher_load, ('Launcher failed to load O3DE client with the "{level}" level - waited "{load_wait}" ' + 'seconds.') # Log monitoring example test. @pytest.mark.parametrize('level', ['simple_jacklocomotion']) @@ -106,7 +104,7 @@ class TestSystemExample(object): """ Tests that the logging paths created by LyTestTools can be monitored for results using the log monitor. """ - # Launch the Lumberyard client & initialize the log monitor. + # Launch the O3DE client & initialize the log monitor. file_to_monitor = launcher.workspace.info_log_path log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, log_file_path=file_to_monitor) @@ -115,7 +113,7 @@ class TestSystemExample(object): for expected_line in expected_lines: logger.info(expected_line) - # Start the Lumberyard client & test that the lines we logged can be viewed by the log monitor. + # Start the O3DE client & test that the lines we logged can be viewed by the log monitor. with launcher.start(): log_test = log_monitor.monitor_log_for_lines( expected_lines=expected_lines, # Defaults to None. From 9067fc3b99af1ff01384a873136e05262f1ed1c2 Mon Sep 17 00:00:00 2001 From: evanchia Date: Thu, 8 Jul 2021 10:24:49 -0700 Subject: [PATCH 006/300] Updating/Removing LyTestTools sample tests Signed-off-by: evanchia --- Tools/LyTestTools/tests/example/__init__.py | 5 - .../tests/example/test_system_example.py | 127 ------------------ Tools/LyTestTools/tests/integ/sanity_tests.py | 17 ++- 3 files changed, 14 insertions(+), 135 deletions(-) delete mode 100755 Tools/LyTestTools/tests/example/__init__.py delete mode 100755 Tools/LyTestTools/tests/example/test_system_example.py diff --git a/Tools/LyTestTools/tests/example/__init__.py b/Tools/LyTestTools/tests/example/__init__.py deleted file mode 100755 index e200fa77d0..0000000000 --- a/Tools/LyTestTools/tests/example/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -""" -Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - -SPDX-License-Identifier: Apache-2.0 OR MIT -""" diff --git a/Tools/LyTestTools/tests/example/test_system_example.py b/Tools/LyTestTools/tests/example/test_system_example.py deleted file mode 100755 index c4f4812428..0000000000 --- a/Tools/LyTestTools/tests/example/test_system_example.py +++ /dev/null @@ -1,127 +0,0 @@ -""" -Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - -SPDX-License-Identifier: Apache-2.0 OR MIT - -Example test using LyTestTools to test Open 3D Engine. -""" -# Python built-in dependencies. -import logging - -# Third party dependencies. -import pytest - -# Optional ly_test_tools dependencies. -import ly_test_tools.log.log_monitor -import ly_remote_console.remote_console_commands as remote_console_commands - -# Configuring the logging is done in ly_test_tools at the following location: -# ~/dev/Tools/LyTestTools/ly_test_tools/_internal/log/py_logging_util.py - -# Use the following logging pattern to hook all test logging together: -logger = logging.getLogger(__name__) - - -# Shared parameters & fixtures for all test methods inside the TestSystemExample class. -@pytest.mark.usefixtures("automatic_process_killer") -@pytest.mark.parametrize('project', ['AutomatedTesting']) -class TestSystemExample(object): - """ - Example test case class to hold a set of test case methods. - - The amount of tests run is based on the parametrization stacking made in each test method or class. - For this test, we placed unique test values in test methods and shared test values in the test class. - We also assume building has already been done, but the test should error if the build is mis-configured. - """ - - # This test method only needs pytest.mark report values and shared test class parameters. - @pytest.mark.parametrize('processes_to_kill', ['Editor.exe']) - @pytest.mark.parametrize("launcher_platform", ['windows_editor']) - def test_SystemTestExample_WindowsPlatform_LaunchEditor(self, editor, processes_to_kill, launcher_platform): - """ - Tests launching the O3DE Editor is successful with the current build. - """ - # Launch the O3DE Editor & verify load is successful: - with editor.start(): - assert editor.is_alive(), ( - 'Editor failed to launch for the current O3DE build.') - - @pytest.fixture - def remote_console(request): - """ - Creates a RemoteConsole() class instance to send console commands to the - O3DE client console. - :param request: _pytest.fixtures.SubRequest class that handles getting - a pytest fixture from a pytest function/fixture. - :return: ly_remote_console.remote_console_commands.RemoteConsole class instance - representing the O3DE Remote Console executable. - """ - # Initialize the RemoteConsole object to send commands to the O3DE client console. - console = remote_console_commands.RemoteConsole() - - # Custom teardown method for this remote_console fixture. - def teardown(): - console.stop() - - # Utilize request.addfinalizer() to add custom teardown() methods. - request.addfinalizer(teardown) # This pattern must be used in pytest version - - return console - - # This test method needs specific parameters not shared by all other tests in the class. - # For targeting specific launchers, use the 'launcher_platform' pytest param like below: - # @pytest.mark.parametrize("launcher_platform", ['android']) - # If you want to target different AssetProcessor platforms, use asset_processor_platform: - # @pytest.mark.parametrize("asset_processor_platform", ['android']) - @pytest.mark.parametrize('level', ['simple_jacklocomotion']) - @pytest.mark.parametrize('load_wait', [120]) - def test_SystemTestExample_AllSupportedPlatforms_LaunchAutomatedTesting(self, launcher, remote_console, level, - load_wait): - """ - Tests launching the AutomatedTesting then launches the O3DE client & - loads the "simple_jacklocomotion" level using the remote console. - Assumes the user already setup & built their machine for the test. - """ - # Launch the O3DE client & remote console test case: - with launcher.start(): - remote_console.start() - # Wait for the expected log line to appear - launcher_load = remote_console.expect_log_line( - match_string='Level system is loading "simple_jacklocomotion"', - timeout=load_wait) - - # Assert loading was successful using remote console logs: - assert launcher_load, ('Launcher failed to load O3DE client with the "{level}" level - waited "{load_wait}" ' - 'seconds.') - - # Log monitoring example test. - @pytest.mark.parametrize('level', ['simple_jacklocomotion']) - @pytest.mark.parametrize('expected_lines', [['Log Monitoring test 1', 'Log Monitoring test 2']]) - @pytest.mark.parametrize('unexpected_lines', [['Unexpected test 1', 'Unexpected test 2']]) - @pytest.mark.test_case_id('C21202585') - def test_SystemTestExample_AllSupportedPlatforms_LogMonitoring(self, level, launcher, expected_lines, - unexpected_lines): - """ - Tests that the logging paths created by LyTestTools can be monitored for results using the log monitor. - """ - # Launch the O3DE client & initialize the log monitor. - file_to_monitor = launcher.workspace.info_log_path - log_monitor = ly_test_tools.log.log_monitor.LogMonitor(launcher=launcher, - log_file_path=file_to_monitor) - - # Generate log lines to the info log using logger. - for expected_line in expected_lines: - logger.info(expected_line) - - # Start the O3DE client & test that the lines we logged can be viewed by the log monitor. - with launcher.start(): - log_test = log_monitor.monitor_log_for_lines( - expected_lines=expected_lines, # Defaults to None. - unexpected_lines=unexpected_lines, # Defaults to None. - halt_on_unexpected=True, # Defaults to False. - timeout=60) # Defaults to 30 - - # Assert the log monitor detected expected lines and did not detect any unexpected lines. - assert log_test, ( - f'Log monitoring failed. Used expected_lines values: {expected_lines} & ' - f'unexpected_lines values: {unexpected_lines}') diff --git a/Tools/LyTestTools/tests/integ/sanity_tests.py b/Tools/LyTestTools/tests/integ/sanity_tests.py index c6c5ce0c31..6c1f1079a9 100755 --- a/Tools/LyTestTools/tests/integ/sanity_tests.py +++ b/Tools/LyTestTools/tests/integ/sanity_tests.py @@ -15,8 +15,6 @@ import ly_test_tools.builtin.helpers as helpers import ly_test_tools.environment.process_utils as process_utils import ly_test_tools.environment.waiter as waiter -pytestmark = pytest.mark.SUITE_smoke - logger = logging.getLogger(__name__) # Note: For device testing, device ids must exist in ~/ly_test_tools/devices.ini, see README.txt for more info. @@ -24,31 +22,44 @@ logger = logging.getLogger(__name__) @pytest.mark.parametrize("project", ["AutomatedTesting"]) class TestAutomatedTestingProject(object): + def test_StartGameLauncher_Sanity(self, project): + # Kill processes that may interfere with the test process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True) try: + # Create the Workspace object workspace = helpers.create_builtin_workspace(project=project) + # Create the Launcher object and add args launcher = launcher_helper.create_launcher(workspace) - launcher.args.extend(['-NullRenderer', '-BatchMode']) + launcher.args.extend(['-NullRenderer']) + # Call the game client executable with launcher.start(): + # Wait for the process to exist waiter.wait_for(lambda: process_utils.process_exists(f"{project}.GameLauncher.exe", ignore_extensions=True)) finally: + # Clean up processes after the test is finished process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True) @pytest.mark.skipif(not ly_test_tools.WINDOWS, reason="Editor currently only functions on Windows") def test_StartEditor_Sanity(self, project): + # Kill processes that may interfere with the test process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True) try: + # Create the Workspace object workspace = helpers.create_builtin_workspace(project=project) + # Create the Launcher object and add args editor = launcher_helper.create_editor(workspace) editor.args.extend(['-NullRenderer', '-autotest_mode']) + # Call the Editor executable with editor.start(): + # Wait for the process to exist waiter.wait_for(lambda: process_utils.process_exists("Editor", ignore_extensions=True)) finally: + # Clean up processes after the test is finished process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True) From bc7e12278cd39d4b495fa9dde226fe74423d8bdb Mon Sep 17 00:00:00 2001 From: evanchia Date: Thu, 8 Jul 2021 15:55:06 -0700 Subject: [PATCH 007/300] changed nullrenderer arg for sanity test Signed-off-by: evanchia --- Tools/LyTestTools/tests/integ/sanity_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/LyTestTools/tests/integ/sanity_tests.py b/Tools/LyTestTools/tests/integ/sanity_tests.py index 6c1f1079a9..0aacfff8c6 100755 --- a/Tools/LyTestTools/tests/integ/sanity_tests.py +++ b/Tools/LyTestTools/tests/integ/sanity_tests.py @@ -33,7 +33,7 @@ class TestAutomatedTestingProject(object): # Create the Launcher object and add args launcher = launcher_helper.create_launcher(workspace) - launcher.args.extend(['-NullRenderer']) + launcher.args.extend(['-rhi=Null']) # Call the game client executable with launcher.start(): @@ -54,7 +54,7 @@ class TestAutomatedTestingProject(object): # Create the Launcher object and add args editor = launcher_helper.create_editor(workspace) - editor.args.extend(['-NullRenderer', '-autotest_mode']) + editor.args.extend(['-rhi=Null', '-autotest_mode']) # Call the Editor executable with editor.start(): From 443e8071e76441759032f9b278b3593bd0895d42 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Fri, 9 Jul 2021 09:32:40 -0700 Subject: [PATCH 008/300] Show link to log while building for currently building build. Signed-off-by: AMZN-Phil --- .../Source/ProjectBuilderController.cpp | 1 + .../ProjectManager/Source/ProjectButtonWidget.cpp | 12 ++++++++++++ .../ProjectManager/Source/ProjectButtonWidget.h | 1 + 3 files changed, 14 insertions(+) diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp index 33defeec8b..115bec3d08 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp @@ -72,6 +72,7 @@ namespace O3DE::ProjectManager { m_projectButton->SetButtonOverlayText(QString("%1 (%2%)\n\n").arg(tr("Building Project..."), QString::number(progress))); m_projectButton->SetProgressBarValue(progress); + m_projectButton->ShowBuildLogsLink(true, m_worker->GetLogFilePath()); } } diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp index cce9da5734..540305057f 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp @@ -266,6 +266,18 @@ namespace O3DE::ProjectManager SetProjectButtonAction(tr("Build Project"), [this]() { emit BuildProject(m_projectInfo); }); } + void ProjectButton::ShowBuildLogsLink(bool show, const QUrl& logUrl) + { + if (!logUrl.isEmpty()) + { + m_projectImageLabel->GetWarningLabel()->setText(tr("Click to view logs.")); + } + + m_projectImageLabel->GetWarningLabel()->setTextInteractionFlags(Qt::LinksAccessibleByMouse); + m_projectImageLabel->GetWarningLabel()->setVisible(show); + m_projectImageLabel->SetLogUrl(logUrl); + } + void ProjectButton::ShowBuildFailed(bool show, const QUrl& logUrl) { if (!logUrl.isEmpty()) diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h index a99984c12f..747fd89a31 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h @@ -77,6 +77,7 @@ namespace O3DE::ProjectManager void SetProjectButtonAction(const QString& text, AZStd::function lambda); void SetProjectBuildButtonAction(); + void ShowBuildLogsLink(bool show, const QUrl& logUrl); void ShowBuildFailed(bool show, const QUrl& logUrl); void SetLaunchButtonEnabled(bool enabled); From 9f5e91be88a0ecaa7b71c3e2b1582c524a322f9b Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Fri, 9 Jul 2021 15:43:44 -0500 Subject: [PATCH 009/300] Updating utility path for test import, and updating linked issue to disabled test Signed-off-by: jckand-amzn --- ...ayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py | 2 +- .../Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py index c99d180253..4752aeddbc 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py @@ -13,7 +13,7 @@ import azlmbr.legacy.general as general import azlmbr.math as math sys.path.append(os.path.join(azlmbr.paths.devroot, 'AutomatedTesting', 'Gem', 'PythonTests')) -from automatedtesting_shared.editor_test_helper import EditorTestHelper +from editor_python_test_tools.editor_test_helper import EditorTestHelper from largeworlds.large_worlds_utils import editor_dynveg_test_helper as dynveg diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py index 410bdbafed..2af848ffb1 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/test_LayerSpawner.py @@ -121,7 +121,7 @@ class TestLayerSpawner(object): @pytest.mark.test_case_id("C30000751") @pytest.mark.SUITE_sandbox @pytest.mark.dynveg_misc - @pytest.mark.skip # ATOM-14828 + @pytest.mark.skip # https://github.com/o3de/o3de/issues/2038 def test_LayerSpawner_InstancesRefreshUsingCorrectViewportCamera(self, request, editor, level, launcher_platform): expected_lines = [ @@ -136,5 +136,6 @@ class TestLayerSpawner(object): editor, "LayerSpawner_InstancesRefreshUsingCorrectViewportCamera.py", expected_lines, - cfg_args=[level] + cfg_args=[level], + null_renderer=False ) From b92848ed88a0441bf2f91b49943dfb6edc5f4d16 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Fri, 9 Jul 2021 14:12:31 -0700 Subject: [PATCH 010/300] Move the show log text to be part of building label. Signed-off-by: AMZN-Phil --- .../Source/ProjectBuilderController.cpp | 4 ++-- .../ProjectManager/Source/ProjectButtonWidget.cpp | 11 +++-------- .../Tools/ProjectManager/Source/ProjectButtonWidget.h | 2 +- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp index 115bec3d08..007d4a72e3 100644 --- a/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectBuilderController.cpp @@ -70,9 +70,9 @@ namespace O3DE::ProjectManager m_lastProgress = progress; if (m_projectButton) { - m_projectButton->SetButtonOverlayText(QString("%1 (%2%)\n\n").arg(tr("Building Project..."), QString::number(progress))); + m_projectButton->SetButtonOverlayText(QString("%1 (%2%)
%3
").arg(tr("Building Project..."), QString::number(progress), tr("Click to view logs."))); m_projectButton->SetProgressBarValue(progress); - m_projectButton->ShowBuildLogsLink(true, m_worker->GetLogFilePath()); + m_projectButton->SetBuildLogsLink(m_worker->GetLogFilePath()); } } diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp index 540305057f..af9a1a7bd9 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.cpp @@ -39,7 +39,9 @@ namespace O3DE::ProjectManager m_overlayLabel->setObjectName("labelButtonOverlay"); m_overlayLabel->setWordWrap(true); m_overlayLabel->setAlignment(Qt::AlignCenter); + m_overlayLabel->setTextInteractionFlags(Qt::LinksAccessibleByMouse); m_overlayLabel->setVisible(false); + connect(m_overlayLabel, &QLabel::linkActivated, this, &LabelButton::OnLinkActivated); vLayout->addWidget(m_overlayLabel); m_buildOverlayLayout = new QVBoxLayout(); @@ -266,15 +268,8 @@ namespace O3DE::ProjectManager SetProjectButtonAction(tr("Build Project"), [this]() { emit BuildProject(m_projectInfo); }); } - void ProjectButton::ShowBuildLogsLink(bool show, const QUrl& logUrl) + void ProjectButton::SetBuildLogsLink(const QUrl& logUrl) { - if (!logUrl.isEmpty()) - { - m_projectImageLabel->GetWarningLabel()->setText(tr("Click to view logs.")); - } - - m_projectImageLabel->GetWarningLabel()->setTextInteractionFlags(Qt::LinksAccessibleByMouse); - m_projectImageLabel->GetWarningLabel()->setVisible(show); m_projectImageLabel->SetLogUrl(logUrl); } diff --git a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h index 747fd89a31..27559b325e 100644 --- a/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h +++ b/Code/Tools/ProjectManager/Source/ProjectButtonWidget.h @@ -77,7 +77,7 @@ namespace O3DE::ProjectManager void SetProjectButtonAction(const QString& text, AZStd::function lambda); void SetProjectBuildButtonAction(); - void ShowBuildLogsLink(bool show, const QUrl& logUrl); + void SetBuildLogsLink(const QUrl& logUrl); void ShowBuildFailed(bool show, const QUrl& logUrl); void SetLaunchButtonEnabled(bool enabled); From ea99ed11a3529a102b64762be6988096abdeb3bb Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Fri, 9 Jul 2021 16:52:22 -0500 Subject: [PATCH 011/300] Updating mesh surface creation, filtering, and expected instance counts Signed-off-by: jckand-amzn --- .../LayerSpawner_FilterStageToggle.py | 27 ++++--------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py index 0224f6bc0a..fb1ac5a5ce 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/LayerSpawner_FilterStageToggle.py @@ -34,8 +34,8 @@ class TestLayerSpawnerFilterStageToggle(EditorTestHelper): :return: None """ - PREPROCESS_INSTANCE_COUNT = 425 - POSTPROCESS_INSTANCE_COUNT = 430 + PREPROCESS_INSTANCE_COUNT = 21 + POSTPROCESS_INSTANCE_COUNT = 19 # Create empty level self.test_success = self.create_level( @@ -56,7 +56,6 @@ class TestLayerSpawnerFilterStageToggle(EditorTestHelper): vegetation_entity.add_component("Vegetation Altitude Filter") vegetation_entity.add_component("Vegetation Position Modifier") - # Create a child entity under vegetation area child_entity = hydra.Entity("child_entity") components_to_add = ["Random Noise Gradient", "Gradient Transform Modifier", "Box Shape"] @@ -66,29 +65,13 @@ class TestLayerSpawnerFilterStageToggle(EditorTestHelper): vegetation_entity.get_set_test(4, "Configuration|Position X|Gradient|Gradient Entity Id", child_entity.id) vegetation_entity.get_set_test(4, "Configuration|Position Y|Gradient|Gradient Entity Id", child_entity.id) - # Set the min and max values for Altitude Filter - vegetation_entity.get_set_test(3, "Configuration|Altitude Min", 32.0) - vegetation_entity.get_set_test(3, "Configuration|Altitude Max", 35.0) + vegetation_entity.get_set_test(3, "Configuration|Altitude Min", 34.0) + vegetation_entity.get_set_test(3, "Configuration|Altitude Max", 38.0) # Add entity with Mesh to replicate creation of hills and a flat surface to plant on dynveg.create_surface_entity("Flat Surface", position, 32.0, 32.0, 1.0) - hill_entity = dynveg.create_mesh_surface_entity_with_slopes("hill", position, 4.0, 4.0, 4.0) - - # Disable/Re-enable Mesh component due to ATOM-14299 - general.idle_wait(1.0) - editor.EditorComponentAPIBus(bus.Broadcast, 'DisableComponents', [hill_entity.components[0]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', hill_entity.components[0]) - if is_enabled: - print("Mesh component is still enabled") - else: - print("Mesh component was disabled") - editor.EditorComponentAPIBus(bus.Broadcast, 'EnableComponents', [hill_entity.components[0]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', hill_entity.components[0]) - if is_enabled: - print("Mesh component is now enabled") - else: - print("Mesh component is still disabled") + hill_entity = dynveg.create_mesh_surface_entity_with_slopes("hill", position, 4.0) # Set the filter stage to preprocess and postprocess respectively and verify instance count vegetation_entity.get_set_test(0, "Configuration|Filter Stage", 1) From 35a60cdf1a7a85b61c669103c5e5b9f0d6ceedeb Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Fri, 9 Jul 2021 17:34:36 -0500 Subject: [PATCH 012/300] Removing unnecessary Mesh component refreshes and updating calls to scale meshes Signed-off-by: jckand-amzn --- .../MeshBlocker_InstancesBlockedByMesh.py | 17 +---------------- ...locker_InstancesBlockedByMeshHeightTuning.py | 17 +---------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py index d23f811f58..89367ca475 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMesh.py @@ -82,22 +82,7 @@ class test_MeshBlocker_InstancesBlockedByMesh(EditorTestHelper): bus.Broadcast, "GetAssetIdByPath", os.path.join("objects", "_primitives", "_box_1x1.azmodel"), math.Uuid(), False) blocker_entity.get_set_test(1, "Controller|Configuration|Mesh Asset", cubeId) - components.TransformBus(bus.Event, "SetLocalScale", blocker_entity.id, math.Vector3(2.0, 2.0, 2.0)) - - # Disable/Re-enable Mesh component due to ATOM-14299 - general.idle_wait(1.0) - editor.EditorComponentAPIBus(bus.Broadcast, 'DisableComponents', [blocker_entity.components[1]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', blocker_entity.components[1]) - if is_enabled: - print("Mesh component is still enabled") - else: - print("Mesh component was disabled") - editor.EditorComponentAPIBus(bus.Broadcast, 'EnableComponents', [blocker_entity.components[1]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', blocker_entity.components[1]) - if is_enabled: - print("Mesh component is now enabled") - else: - print("Mesh component is still disabled") + components.TransformBus(bus.Event, "SetLocalUniformScale", blocker_entity.id, 2.0) # Verify spawned instance counts are accurate after addition of Blocker Entity num_expected = 160 # Number of "PurpleFlower"s that plant on a 10 x 10 surface minus 2m blocker cube diff --git a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py index ad57f80776..4a3edcd0e9 100755 --- a/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py +++ b/AutomatedTesting/Gem/PythonTests/largeworlds/dyn_veg/EditorScripts/MeshBlocker_InstancesBlockedByMeshHeightTuning.py @@ -88,24 +88,9 @@ class test_MeshBlocker_InstancesBlockedByMeshHeightTuning(EditorTestHelper): bus.Broadcast, "GetAssetIdByPath", os.path.join("objects", "_primitives", "_box_1x1.azmodel"), math.Uuid(), False) blocker_entity.get_set_test(1, "Controller|Configuration|Mesh Asset", sphere_id) - components.TransformBus(bus.Event, "SetLocalScale", blocker_entity.id, math.Vector3(5.0, 5.0, 5.0)) + components.TransformBus(bus.Event, "SetLocalUniformScale", blocker_entity.id, 5.0) components.TransformBus(bus.Event, "SetLocalRotation", blocker_entity.id, math.Vector3(0.0, y_rotation, 0.0)) - # Disable/Re-enable Mesh component due to ATOM-14299 - general.idle_wait(1.0) - editor.EditorComponentAPIBus(bus.Broadcast, 'DisableComponents', [blocker_entity.components[1]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', blocker_entity.components[1]) - if is_enabled: - print("Mesh component is still enabled") - else: - print("Mesh component was disabled") - editor.EditorComponentAPIBus(bus.Broadcast, 'EnableComponents', [blocker_entity.components[1]]) - is_enabled = editor.EditorComponentAPIBus(bus.Broadcast, 'IsComponentEnabled', blocker_entity.components[1]) - if is_enabled: - print("Mesh component is now enabled") - else: - print("Mesh component is still disabled") - # 5) Adjust the height Max percentage values of blocker blocker_entity.get_set_test(0, "Configuration|Mesh Height Percent Max", 0.8) From ceae858f099699db0a183707c9fa500a9ce06832 Mon Sep 17 00:00:00 2001 From: jckand-amzn Date: Fri, 9 Jul 2021 17:50:07 -0500 Subject: [PATCH 013/300] Updating to use of psutil directly Signed-off-by: jckand-amzn --- .../editor_python_test_tools/hydra_test_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py index 343eb5b12d..382a6f27f7 100644 --- a/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py +++ b/AutomatedTesting/Gem/PythonTests/EditorPythonTestTools/editor_python_test_tools/hydra_test_utils.py @@ -6,13 +6,13 @@ SPDX-License-Identifier: Apache-2.0 OR MIT import logging import os -import tempfile +import psutil import ly_test_tools.log.log_monitor import ly_test_tools.environment.process_utils as process_utils import ly_test_tools.environment.waiter as waiter -from ly_remote_console.remote_console_commands import RemoteConsole as RemoteConsole from ly_remote_console.remote_console_commands import send_command_and_expect_response as send_command_and_expect_response + logger = logging.getLogger(__name__) @@ -89,7 +89,7 @@ def launch_and_validate_results_launcher(launcher, level, remote_console_instanc :return: True if port is listening. """ port_listening = False - for conn in process_utils.psutil.net_connections(): + for conn in psutil.net_connections(): if 'port={}'.format(port) in str(conn): port_listening = True return port_listening From b0bc076febcde313313a59464168a770a83878d1 Mon Sep 17 00:00:00 2001 From: abrmich Date: Thu, 1 Jul 2021 18:01:25 -0700 Subject: [PATCH 014/300] Removed unused bus connection Signed-off-by: abrmich --- Gems/LyShine/Code/Source/LyShineSystemComponent.cpp | 2 -- Gems/LyShine/Code/Source/LyShineSystemComponent.h | 1 - 2 files changed, 3 deletions(-) diff --git a/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp b/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp index 7521c8b6c1..b420e551b5 100644 --- a/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp +++ b/Gems/LyShine/Code/Source/LyShineSystemComponent.cpp @@ -148,7 +148,6 @@ namespace LyShine { LyShineAllocatorScope::ActivateAllocators(); - LyShineRequestBus::Handler::BusConnect(); UiSystemBus::Handler::BusConnect(); UiSystemToolsBus::Handler::BusConnect(); UiFrameworkBus::Handler::BusConnect(); @@ -196,7 +195,6 @@ namespace LyShine UiSystemBus::Handler::BusDisconnect(); UiSystemToolsBus::Handler::BusDisconnect(); UiFrameworkBus::Handler::BusDisconnect(); - LyShineRequestBus::Handler::BusDisconnect(); CrySystemEventBus::Handler::BusDisconnect(); LyShineAllocatorScope::DeactivateAllocators(); diff --git a/Gems/LyShine/Code/Source/LyShineSystemComponent.h b/Gems/LyShine/Code/Source/LyShineSystemComponent.h index 5b455715ee..2737ba8667 100644 --- a/Gems/LyShine/Code/Source/LyShineSystemComponent.h +++ b/Gems/LyShine/Code/Source/LyShineSystemComponent.h @@ -28,7 +28,6 @@ namespace LyShine class LyShineSystemComponent : public AZ::Component - , protected LyShineRequestBus::Handler , protected UiSystemBus::Handler , protected UiSystemToolsBus::Handler , protected LyShineAllocatorScope From 5fe980edf19b8ac26dd75be0f0c5d4982ca29a4d Mon Sep 17 00:00:00 2001 From: abrmich Date: Fri, 9 Jul 2021 17:58:14 -0700 Subject: [PATCH 015/300] Remove unused header Signed-off-by: abrmich --- Gems/LyShine/Code/Source/LyShineSystemComponent.h | 1 - 1 file changed, 1 deletion(-) diff --git a/Gems/LyShine/Code/Source/LyShineSystemComponent.h b/Gems/LyShine/Code/Source/LyShineSystemComponent.h index 2737ba8667..70e7eb5fe5 100644 --- a/Gems/LyShine/Code/Source/LyShineSystemComponent.h +++ b/Gems/LyShine/Code/Source/LyShineSystemComponent.h @@ -13,7 +13,6 @@ #include -#include #include #include #include From a8435ec982bfcee020eba7ca964e18b52ccce384 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 10:23:48 -0700 Subject: [PATCH 016/300] Issues/2045 3rdParty runtime dependencies copied multiple times (#2058) * 3rdParty runtime dependencies copied multiple times Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * 3rdParty to update timestamps when uncompressing to provoke copy of runtime dependencies Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * typo fix Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- cmake/3rdPartyPackages.cmake | 6 ++++++ cmake/Platform/Common/runtime_dependencies_common.cmake.in | 1 + cmake/Platform/Mac/runtime_dependencies_mac.cmake.in | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/3rdPartyPackages.cmake b/cmake/3rdPartyPackages.cmake index 9a632798e8..0d1667f0e1 100644 --- a/cmake/3rdPartyPackages.cmake +++ b/cmake/3rdPartyPackages.cmake @@ -529,6 +529,12 @@ function(ly_force_download_package package_name) execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf ${temp_download_target} WORKING_DIRECTORY ${final_folder} COMMAND_ECHO STDOUT OUTPUT_VARIABLE unpack_result) + # For the runtime dependencies cases, we need the timestamps of the files coming from 3rdParty to be newer than the ones + # from the output so the new versions get copied over. The untar from the previous step preserves timestamps so they + # can produce binaries with older timestamps to the ones that are in the build output. + file(GLOB_RECURSE package_files LIST_DIRECTORIES false ${final_folder}/*) + file(TOUCH_NOCREATE ${package_files}) + if (NOT ${unpack_result} EQUAL 0) message(SEND_ERROR "ly_package: required package {package_name} could not be unpacked. Compile may fail! Enable LY_PACKAGE_DEBUG to debug.") return() diff --git a/cmake/Platform/Common/runtime_dependencies_common.cmake.in b/cmake/Platform/Common/runtime_dependencies_common.cmake.in index 9d23a73a26..104c20205c 100644 --- a/cmake/Platform/Common/runtime_dependencies_common.cmake.in +++ b/cmake/Platform/Common/runtime_dependencies_common.cmake.in @@ -15,6 +15,7 @@ function(ly_copy source_file target_directory) if("${source_file}" IS_NEWER_THAN "${target_directory}/${target_filename}") message(STATUS "Copying \"${source_file}\" to \"${target_directory}\"...") file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) + file(TOUCH_NOCREATE ${target_directory}/${target_filename}) endif() endif() endfunction() diff --git a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in index 9f9006c4c0..9869871f85 100644 --- a/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in +++ b/cmake/Platform/Mac/runtime_dependencies_mac.cmake.in @@ -125,7 +125,7 @@ function(ly_copy source_file target_directory) file(LOCK ${target_directory}/${target_filename}.lock GUARD FUNCTION TIMEOUT 300) endif() file(COPY "${source_file}" DESTINATION "${target_directory}" FILE_PERMISSIONS @LY_COPY_PERMISSIONS@ FOLLOW_SYMLINK_CHAIN) - file(TOUCH ${target_directory}/${target_filename}) + file(TOUCH_NOCREATE ${target_directory}/${target_filename}) set(anything_new TRUE PARENT_SCOPE) endif() endif() From f83439e6c4d2fdd16b0433488855bab540154a95 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 10:24:45 -0700 Subject: [PATCH 017/300] Add Vcpkg settings to map configs to what vcpkg expects (this prevents a message from being issue when vcpkg is installed) (#2063) Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- cmake/Platform/Common/Directory.Build.props | 1 + cmake/Platform/Common/VisualStudio_common.cmake | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/Platform/Common/Directory.Build.props b/cmake/Platform/Common/Directory.Build.props index 29dbcd8584..9389a008ad 100644 --- a/cmake/Platform/Common/Directory.Build.props +++ b/cmake/Platform/Common/Directory.Build.props @@ -9,6 +9,7 @@ SPDX-License-Identifier: Apache-2.0 OR MIT true true +@VCPKG_CONFIGURATION_MAPPING@ diff --git a/cmake/Platform/Common/VisualStudio_common.cmake b/cmake/Platform/Common/VisualStudio_common.cmake index 345214274b..91817bef6f 100644 --- a/cmake/Platform/Common/VisualStudio_common.cmake +++ b/cmake/Platform/Common/VisualStudio_common.cmake @@ -6,5 +6,15 @@ # if(CMAKE_GENERATOR MATCHES "Visual Studio 16") - configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_BINARY_DIR}/Directory.Build.props" COPYONLY) + + foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + if(conf STREQUAL debug) + string(APPEND VCPKG_CONFIGURATION_MAPPING " Debug\n") + else() + string(APPEND VCPKG_CONFIGURATION_MAPPING " Release\n") + endif() + endforeach() + + configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_BINARY_DIR}/Directory.Build.props" @ONLY) + endif() \ No newline at end of file From a7751de2715fb3febb7372fa00a226010dd57468 Mon Sep 17 00:00:00 2001 From: AMZN-Phil Date: Mon, 12 Jul 2021 11:07:09 -0700 Subject: [PATCH 018/300] Fix feature category spellings Signed-off-by: AMZN-Phil --- Gems/AssetMemoryAnalyzer/gem.json | 2 +- Gems/AudioEngineWwise/gem.json | 2 +- Gems/AudioSystem/gem.json | 2 +- Gems/ExpressionEvaluation/gem.json | 2 +- Gems/GameStateSamples/gem.json | 2 +- Gems/ScriptCanvas/gem.json | 2 +- Gems/SurfaceData/gem.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gems/AssetMemoryAnalyzer/gem.json b/Gems/AssetMemoryAnalyzer/gem.json index 8c63d51e1a..45610e417c 100644 --- a/Gems/AssetMemoryAnalyzer/gem.json +++ b/Gems/AssetMemoryAnalyzer/gem.json @@ -6,7 +6,7 @@ "type": "Code", "summary": "The Asset Memory Analyzer Gem provides tools to profile asset memory usage in Open 3D Engine through ImGUI (Immediate Mode Graphical User Interface).", "canonical_tags": ["Gem"], - "user_tags": ["Debug", "Utillity", "Tools"], + "user_tags": ["Debug", "Utility", "Tools"], "icon_path": "preview.png", "requirements": "" } diff --git a/Gems/AudioEngineWwise/gem.json b/Gems/AudioEngineWwise/gem.json index 8c6b5767b0..dc5f968bc7 100644 --- a/Gems/AudioEngineWwise/gem.json +++ b/Gems/AudioEngineWwise/gem.json @@ -6,7 +6,7 @@ "type": "Code", "summary": "The Wwise Audio Engine Gem provides support for Audiokinetic Wave Works Interactive Sound Engine (Wwise).", "canonical_tags": ["Gem"], - "user_tags": ["Audio", "Utiltity", "Tools"], + "user_tags": ["Audio", "Utility", "Tools"], "icon_path": "preview.png", "requirements": "Users will need to download WWise from the AudioKinetic web site: https://www.audiokinetic.com/download/" } diff --git a/Gems/AudioSystem/gem.json b/Gems/AudioSystem/gem.json index a1dbe9406f..a9058cb42e 100644 --- a/Gems/AudioSystem/gem.json +++ b/Gems/AudioSystem/gem.json @@ -6,7 +6,7 @@ "type": "Code", "summary": "The Audio System Gem provides the Audio Translation Layer (ATL) and Audio Controls Editor, which add support for audio in Open 3D Engine.", "canonical_tags": ["Gem"], - "user_tags": ["Audio", "Utiltity", "Tools"], + "user_tags": ["Audio", "Utility", "Tools"], "icon_path": "preview.png", "requirements": "" } diff --git a/Gems/ExpressionEvaluation/gem.json b/Gems/ExpressionEvaluation/gem.json index 9302af152a..92d5963891 100644 --- a/Gems/ExpressionEvaluation/gem.json +++ b/Gems/ExpressionEvaluation/gem.json @@ -6,7 +6,7 @@ "type": "Code", "summary": "The Expression Evaluation Gem provides a method for parsing and executing string expressions in Open 3D Engine.", "canonical_tags": ["Gem"], - "user_tags": ["Scripting", "Utiltity"], + "user_tags": ["Scripting", "Utility"], "icon_path": "preview.png", "requirements": "" } diff --git a/Gems/GameStateSamples/gem.json b/Gems/GameStateSamples/gem.json index ce0fcbd868..0241a8a1b7 100644 --- a/Gems/GameStateSamples/gem.json +++ b/Gems/GameStateSamples/gem.json @@ -6,7 +6,7 @@ "type": "Code", "summary": "The Game State Samples Gem provides a set of sample game states (built on top of the Game State Gem), including primary user selection, main menu, level loading, level running, and level paused.", "canonical_tags": ["Gem"], - "user_tags": ["Gameplay", "Samples", "Assets"], + "user_tags": ["Gameplay", "Sample", "Assets"], "icon_path": "preview.png", "requirements": "" } diff --git a/Gems/ScriptCanvas/gem.json b/Gems/ScriptCanvas/gem.json index 680ce6ef1f..413e58ef7e 100644 --- a/Gems/ScriptCanvas/gem.json +++ b/Gems/ScriptCanvas/gem.json @@ -6,7 +6,7 @@ "type": "Tool", "summary": "The Script Canvas Gem provides Open 3D Engine's visual scripting environment, Script Canvas.", "canonical_tags": ["Gem"], - "user_tags": ["Scripting", "Tools", "Utiltiy"], + "user_tags": ["Scripting", "Tools", "Utility"], "icon_path": "preview.png", "requirements": "" } diff --git a/Gems/SurfaceData/gem.json b/Gems/SurfaceData/gem.json index 1fb521ef58..24f7f1cb21 100644 --- a/Gems/SurfaceData/gem.json +++ b/Gems/SurfaceData/gem.json @@ -6,7 +6,7 @@ "type": "Code", "summary": "The Surface Data Gem provides functionality to emit signals or tags from surfaces such as meshes and terrain.", "canonical_tags": ["Gem"], - "user_tags": ["Environment", "Utiltiy", "Design"], + "user_tags": ["Environment", "Utility", "Design"], "icon_path": "preview.png", "requirements": "" } From 41e864de95a04ba8767773f9b6eb0a1e07351ca1 Mon Sep 17 00:00:00 2001 From: brianherrera Date: Fri, 9 Jul 2021 15:48:37 -0700 Subject: [PATCH 019/300] Remove separate git lfs steps. The steps to remove git lfs hooks and inject creds are no longer required with the public repo. Signed-off-by: brianherrera --- scripts/build/Jenkins/Jenkinsfile | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/build/Jenkins/Jenkinsfile b/scripts/build/Jenkins/Jenkinsfile index a7a796f3b7..70618fea78 100644 --- a/scripts/build/Jenkins/Jenkinsfile +++ b/scripts/build/Jenkins/Jenkinsfile @@ -204,8 +204,6 @@ def CheckoutRepo(boolean disableSubmodules = false) { if (!fileExists(ENGINE_REPOSITORY_NAME)) { palMkdir(ENGINE_REPOSITORY_NAME) } - - palSh('git lfs uninstall', 'Git LFS Uninstall') // Prevent git from pulling lfs objects during checkout if(fileExists('.git')) { // If the repository after checkout is locked, likely we took a snapshot while git was running, @@ -239,13 +237,6 @@ def CheckoutRepo(boolean disableSubmodules = false) { ] } - // Run lfs in a separate step. Jenkins is unable to load the credentials for the custom LFS endpoint - withCredentials([usernamePassword(credentialsId: "${env.GITHUB_USER}", passwordVariable: 'accesstoken', usernameVariable: 'username')]) { - palSh("git config -f .lfsconfig lfs.url https://${username}:${accesstoken}@${env.LFS_URL}", 'Set credentials', false) - } - palSh('git lfs install', 'Git LFS Install') - palSh('git lfs pull', 'Git LFS Pull') - // CHANGE_ID is used by some scripts to identify uniquely the current change (usually metric jobs) palSh('git rev-parse HEAD > commitid', 'Getting commit id') env.CHANGE_ID = readFile file: 'commitid' From 585caabd950dc7abdee2efe3e29f0dbebb8ac020 Mon Sep 17 00:00:00 2001 From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com> Date: Mon, 12 Jul 2021 11:38:05 -0700 Subject: [PATCH 020/300] [installer/2106-3p-license-fix] replaced 3rd party license url arg with auto generated one from version string Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com> --- cmake/Packaging.cmake | 55 ++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 30 deletions(-) diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index d77b5a30f8..a07e1ec1d3 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -125,37 +125,32 @@ install(FILES ${_cmake_package_dest} DESTINATION ./Tools/Redistributables/CMake ) -# temporary workaround for acquiring the 3rd party SPDX license manifest, the desired location is from -# another git repository that's private. once it's public, only how the URL is formed should change -set(LY_INSTALLER_3RD_PARTY_LICENSE_URL "" CACHE STRING "URL to the 3rd party SPDX license manifest file for inclusion in packaging.") - -if(${LY_VERSION_STRING} VERSION_GREATER "0.0.0.0" AND NOT LY_INSTALLER_3RD_PARTY_LICENSE_URL) - message(FATAL_ERROR "Missing required URL for the 3rd party SPDX license manifest file. " - "Please specifiy where to acquire the file via LY_INSTALLER_3RD_PARTY_LICENSE_URL") -endif() - -string(REPLACE "/" ";" _url_components ${LY_INSTALLER_3RD_PARTY_LICENSE_URL}) -list(POP_BACK _url_components _3rd_party_license_filename) - -set(_3rd_party_license_dest ${CPACK_BINARY_DIR}/${_3rd_party_license_filename}) - -# use the plain file downloader as we don't have the file hash available and using a dummy will -# delete the file once it fails hash verification -file(DOWNLOAD - ${LY_INSTALLER_3RD_PARTY_LICENSE_URL} - ${_3rd_party_license_dest} - STATUS _status - TLS_VERIFY ON -) -list(POP_FRONT _status _status_code) - -if (${_status_code} EQUAL 0 AND EXISTS ${_3rd_party_license_dest}) - install(FILES ${_3rd_party_license_dest} - DESTINATION . +# the version string and git tags are intended to be synchronized so it should be safe to use that instead +# of directly calling into git which could get messy in certain scenarios +if(${CPACK_PACKAGE_VERSION} VERSION_GREATER "0.0.0.0") + set(_3rd_party_license_filename SPDX-Licenses.txt) + + set(_3rd_party_license_url "https://raw.githubusercontent.com/o3de/3p-package-source/${CPACK_PACKAGE_VERSION}/${_3rd_party_license_filename}") + set(_3rd_party_license_dest ${CPACK_BINARY_DIR}/${_3rd_party_license_filename}) + + # use the plain file downloader as we don't have the file hash available and using a dummy will + # delete the file once it fails hash verification + file(DOWNLOAD + ${_3rd_party_license_url} + ${_3rd_party_license_dest} + STATUS _status + TLS_VERIFY ON ) -else() - file(REMOVE ${_3rd_party_license_dest}) - message(FATAL_ERROR "Failed to acquire the 3rd Party license manifest file. Error: ${_status}") + list(POP_FRONT _status _status_code) + + if (${_status_code} EQUAL 0 AND EXISTS ${_3rd_party_license_dest}) + install(FILES ${_3rd_party_license_dest} + DESTINATION . + ) + else() + file(REMOVE ${_3rd_party_license_dest}) + message(FATAL_ERROR "Failed to acquire the 3rd Party license manifest file at ${_3rd_party_license_url}. Error: ${_status}") + endif() endif() # checks for and removes trailing slash From 2fad7f37db565815d12bcc2f053e605f02e5384d Mon Sep 17 00:00:00 2001 From: AMZN-nggieber <52797929+AMZN-nggieber@users.noreply.github.com> Date: Mon, 12 Jul 2021 11:54:36 -0700 Subject: [PATCH 021/300] Added a Warning When VS2019 is not Installed with Link to Download it (#2042) * Added a warning when VS2019 is not installed with link to download it Signed-off-by: nggieber * Widden VSWarning dialog Signed-off-by: nggieber * Fix issue with checking for Visual Studio Signed-off-by: nggieber * PALify compiler detection Signed-off-by: nggieber * Changed windows compiler check to waitForFinished instead of waitForReadyRead Signed-off-by: nggieber --- .../Platform/Linux/PAL_linux_files.cmake | 1 + .../Platform/Linux/ProjectUtils_linux.cpp | 21 +++++++ .../Platform/Mac/PAL_mac_files.cmake | 1 + .../Platform/Mac/ProjectUtils_mac.cpp | 21 +++++++ .../Platform/Windows/PAL_windows_files.cmake | 1 + .../Platform/Windows/ProjectUtils_windows.cpp | 60 +++++++++++++++++++ .../Source/CreateProjectCtrl.cpp | 47 ++++++++------- .../ProjectManager/Source/ProjectUtils.cpp | 53 ++++++---------- .../ProjectManager/Source/ProjectUtils.h | 4 +- .../ProjectManager/Source/ProjectsScreen.cpp | 2 +- 10 files changed, 153 insertions(+), 58 deletions(-) create mode 100644 Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp create mode 100644 Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp create mode 100644 Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp diff --git a/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake index e8085de555..4125861f2b 100644 --- a/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake +++ b/Code/Tools/ProjectManager/Platform/Linux/PAL_linux_files.cmake @@ -8,4 +8,5 @@ set(FILES Python_linux.cpp ProjectBuilderWorker_linux.cpp + ProjectUtils_linux.cpp ) diff --git a/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp new file mode 100644 index 0000000000..64d18ec605 --- /dev/null +++ b/Code/Tools/ProjectManager/Platform/Linux/ProjectUtils_linux.cpp @@ -0,0 +1,21 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#include + +namespace O3DE::ProjectManager +{ + namespace ProjectUtils + { + AZ::Outcome FindSupportedCompilerForPlatform() + { + // Compiler detection not supported on platform + return AZ::Success(); + } + + } // namespace ProjectUtils +} // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake index 01d6b5f112..a0d3add840 100644 --- a/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake +++ b/Code/Tools/ProjectManager/Platform/Mac/PAL_mac_files.cmake @@ -8,4 +8,5 @@ set(FILES Python_mac.cpp ProjectBuilderWorker_mac.cpp + ProjectUtils_mac.cpp ) diff --git a/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp new file mode 100644 index 0000000000..64d18ec605 --- /dev/null +++ b/Code/Tools/ProjectManager/Platform/Mac/ProjectUtils_mac.cpp @@ -0,0 +1,21 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#include + +namespace O3DE::ProjectManager +{ + namespace ProjectUtils + { + AZ::Outcome FindSupportedCompilerForPlatform() + { + // Compiler detection not supported on platform + return AZ::Success(); + } + + } // namespace ProjectUtils +} // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake index eb45c61807..8af7638696 100644 --- a/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake +++ b/Code/Tools/ProjectManager/Platform/Windows/PAL_windows_files.cmake @@ -8,4 +8,5 @@ set(FILES Python_windows.cpp ProjectBuilderWorker_windows.cpp + ProjectUtils_windows.cpp ) diff --git a/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp new file mode 100644 index 0000000000..c0d977a5f5 --- /dev/null +++ b/Code/Tools/ProjectManager/Platform/Windows/ProjectUtils_windows.cpp @@ -0,0 +1,60 @@ +/* + * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + * + */ + +#include + +#include +#include +#include +#include + +namespace O3DE::ProjectManager +{ + namespace ProjectUtils + { + AZ::Outcome FindSupportedCompilerForPlatform() + { + QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); + QString programFilesPath = environment.value("ProgramFiles(x86)"); + QString vsWherePath = QDir(programFilesPath).filePath("Microsoft Visual Studio/Installer/vswhere.exe"); + + QFileInfo vsWhereFile(vsWherePath); + if (vsWhereFile.exists() && vsWhereFile.isFile()) + { + QProcess vsWhereProcess; + vsWhereProcess.setProcessChannelMode(QProcess::MergedChannels); + + vsWhereProcess.start( + vsWherePath, + QStringList{ + "-version", + "16.0", + "-latest", + "-requires", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "-property", + "isComplete" + }); + + if (vsWhereProcess.waitForStarted() && vsWhereProcess.waitForFinished()) + { + QString vsWhereOutput(vsWhereProcess.readAllStandardOutput()); + if (vsWhereOutput.startsWith("1")) + { + return AZ::Success(); + } + } + } + + return AZ::Failure(QObject::tr("Visual Studio 2019 not found.\n\n" + "Visual Studio 2019 is required to build this project." + " Install any edition of Visual Studio 2019" + " before proceeding to the next step.")); + } + + } // namespace ProjectUtils +} // namespace O3DE::ProjectManager diff --git a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp index 9c0b4726ed..b2b656dbae 100644 --- a/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp +++ b/Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp @@ -12,6 +12,7 @@ #include #include #include +#include #include #include @@ -222,38 +223,42 @@ namespace O3DE::ProjectManager void CreateProjectCtrl::CreateProject() { - if (m_newProjectSettingsScreen->Validate()) + if (ProjectUtils::FindSupportedCompiler(this)) { - ProjectInfo projectInfo = m_newProjectSettingsScreen->GetProjectInfo(); - QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath(); - - auto result = PythonBindingsInterface::Get()->CreateProject(projectTemplatePath, projectInfo); - if (result.IsSuccess()) + if (m_newProjectSettingsScreen->Validate()) { - // automatically register the project - PythonBindingsInterface::Get()->AddProject(projectInfo.m_path); + ProjectInfo projectInfo = m_newProjectSettingsScreen->GetProjectInfo(); + QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath(); -#ifdef TEMPLATE_GEM_CONFIGURATION_ENABLED - if (!m_gemCatalogScreen->EnableDisableGemsForProject(projectInfo.m_path)) + auto result = PythonBindingsInterface::Get()->CreateProject(projectTemplatePath, projectInfo); + if (result.IsSuccess()) { - QMessageBox::critical(this, tr("Failed to configure gems"), tr("Failed to configure gems for template.")); - return; - } + // automatically register the project + PythonBindingsInterface::Get()->AddProject(projectInfo.m_path); + +#ifdef TEMPLATE_GEM_CONFIGURATION_ENABLED + if (!m_gemCatalogScreen->EnableDisableGemsForProject(projectInfo.m_path)) + { + QMessageBox::critical(this, tr("Failed to configure gems"), tr("Failed to configure gems for template.")); + return; + } #endif // TEMPLATE_GEM_CONFIGURATION_ENABLED - projectInfo.m_needsBuild = true; - emit NotifyBuildProject(projectInfo); - emit ChangeScreenRequest(ProjectManagerScreen::Projects); + projectInfo.m_needsBuild = true; + emit NotifyBuildProject(projectInfo); + emit ChangeScreenRequest(ProjectManagerScreen::Projects); + } + else + { + QMessageBox::critical(this, tr("Project creation failed"), tr("Failed to create project.")); + } } else { - QMessageBox::critical(this, tr("Project creation failed"), tr("Failed to create project.")); + QMessageBox::warning( + this, tr("Invalid project settings"), tr("Please correct the indicated project settings and try again.")); } } - else - { - QMessageBox::warning(this, tr("Invalid project settings"), tr("Please correct the indicated project settings and try again.")); - } } void CreateProjectCtrl::ReinitGemCatalogForSelectedTemplate() diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp index 83e7546670..827973cbec 100644 --- a/Code/Tools/ProjectManager/Source/ProjectUtils.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectUtils.cpp @@ -17,6 +17,8 @@ #include #include #include +#include +#include namespace O3DE::ProjectManager { @@ -374,46 +376,27 @@ namespace O3DE::ProjectManager return true; } - static bool IsVS2019Installed_internal() + bool FindSupportedCompiler(QWidget* parent) { - QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); - QString programFilesPath = environment.value("ProgramFiles(x86)"); - QString vsWherePath = programFilesPath + "\\Microsoft Visual Studio\\Installer\\vswhere.exe"; + auto findCompilerResult = FindSupportedCompilerForPlatform(); - QFileInfo vsWhereFile(vsWherePath); - if (vsWhereFile.exists() && vsWhereFile.isFile()) + if (!findCompilerResult.IsSuccess()) { - QProcess vsWhereProcess; - vsWhereProcess.setProcessChannelMode(QProcess::MergedChannels); - - vsWhereProcess.start( - vsWherePath, - QStringList{ "-version", "16.0", "-latest", "-requires", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "-property", "isComplete" }); - - if (!vsWhereProcess.waitForStarted()) - { - return false; - } - - while (vsWhereProcess.waitForReadyRead()) - { - } - - QString vsWhereOutput(vsWhereProcess.readAllStandardOutput()); - if (vsWhereOutput.startsWith("1")) - { - return true; - } + QMessageBox vsWarningMessage(parent); + vsWarningMessage.setIcon(QMessageBox::Warning); + vsWarningMessage.setWindowTitle(QObject::tr("Create Project")); + // Makes link clickable + vsWarningMessage.setTextFormat(Qt::RichText); + vsWarningMessage.setText(findCompilerResult.GetError()); + vsWarningMessage.setStandardButtons(QMessageBox::Close); + + QSpacerItem* horizontalSpacer = new QSpacerItem(600, 0, QSizePolicy::Minimum, QSizePolicy::Expanding); + QGridLayout* layout = reinterpret_cast(vsWarningMessage.layout()); + layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount()); + vsWarningMessage.exec(); } - return false; - } - - bool IsVS2019Installed() - { - static bool vs2019Installed = IsVS2019Installed_internal(); - return vs2019Installed; + return findCompilerResult.IsSuccess(); } ProjectManagerScreen GetProjectManagerScreen(const QString& screen) diff --git a/Code/Tools/ProjectManager/Source/ProjectUtils.h b/Code/Tools/ProjectManager/Source/ProjectUtils.h index 2829a45180..1035ceea65 100644 --- a/Code/Tools/ProjectManager/Source/ProjectUtils.h +++ b/Code/Tools/ProjectManager/Source/ProjectUtils.h @@ -8,6 +8,7 @@ #include #include +#include namespace O3DE::ProjectManager { @@ -23,7 +24,8 @@ namespace O3DE::ProjectManager bool ReplaceFile(const QString& origFile, const QString& newFile, QWidget* parent = nullptr, bool interactive = true); - bool IsVS2019Installed(); + bool FindSupportedCompiler(QWidget* parent = nullptr); + AZ::Outcome FindSupportedCompilerForPlatform(); ProjectManagerScreen GetProjectManagerScreen(const QString& screen); } // namespace ProjectUtils diff --git a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp index a31cd8b263..54fdc370d7 100644 --- a/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp +++ b/Code/Tools/ProjectManager/Source/ProjectsScreen.cpp @@ -516,7 +516,7 @@ namespace O3DE::ProjectManager bool ProjectsScreen::StartProjectBuild(const ProjectInfo& projectInfo) { - if (ProjectUtils::IsVS2019Installed()) + if (ProjectUtils::FindSupportedCompiler(this)) { QMessageBox::StandardButton buildProject = QMessageBox::information( this, From b7e3db9d82fa4ea76d88eade06163af2e6cdc6b2 Mon Sep 17 00:00:00 2001 From: srikappa Date: Mon, 12 Jul 2021 11:58:14 -0700 Subject: [PATCH 022/300] Make prefab patch application use a best effort mechanism Signed-off-by: srikappa --- .../AzCore/Serialization/Json/JsonMerger.cpp | 10 +++- .../Serialization/Json/TestCases_Patching.cpp | 52 ++++++++++++++++++- .../Instance/InstanceToTemplatePropagator.cpp | 19 ++++--- .../AzToolsFramework/Prefab/Link/Link.cpp | 23 ++++++-- .../Prefab/PrefabDomUtils.cpp | 20 +++++++ .../AzToolsFramework/Prefab/PrefabDomUtils.h | 6 +++ .../AzToolsFramework/Prefab/PrefabUndo.cpp | 9 +++- .../Tests/Prefab/PrefabUndoLinkTests.cpp | 4 +- 8 files changed, 123 insertions(+), 20 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp index 61869b7eb5..51e47840c9 100644 --- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp +++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp @@ -110,7 +110,15 @@ namespace AZ if (result.GetProcessing() == Processing::Halted) { - return result; + ResultCode reportedResult = settings.m_reporting(R"(One of the patches couldn't be applied correctly.)", result, element); + if (reportedResult.GetOutcome() == Outcomes::PartialSkip) + { + result = reportedResult; + } + else + { + return result; + } } } diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp index ae2dea4e48..046bb88d76 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp +++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp @@ -6,6 +6,7 @@ */ #include +#include #include #include @@ -43,7 +44,9 @@ namespace JsonSerializationTests } void CheckApplyPatchOutcome(const char* target, const char* patch, - AZ::JsonSerializationResult::Outcomes outcome, AZ::JsonSerializationResult::Processing processing) + AZ::JsonSerializationResult::Outcomes outcome, + AZ::JsonSerializationResult::Processing processing, + const AZ::JsonApplyPatchSettings& settings = AZ::JsonApplyPatchSettings{}) { m_jsonDocument->Parse(target); ASSERT_FALSE(m_jsonDocument->HasParseError()); @@ -53,12 +56,27 @@ namespace JsonSerializationTests ASSERT_FALSE(patchDocument.HasParseError()); AZ::JsonSerializationResult::ResultCode result = AZ::JsonSerialization::ApplyPatch(*m_jsonDocument, - m_jsonDocument->GetAllocator(), patchDocument, AZ::JsonMergeApproach::JsonPatch); + m_jsonDocument->GetAllocator(), patchDocument, AZ::JsonMergeApproach::JsonPatch, settings); EXPECT_EQ(result.GetTask(), AZ::JsonSerializationResult::Tasks::Merge); EXPECT_EQ(result.GetOutcome(), outcome); EXPECT_EQ(result.GetProcessing(), processing); } + void CheckApplyPatchOutcome( + const char* target, + const char* patch, + const char* expectedPatchedResult, + AZ::JsonSerializationResult::Outcomes outcome, + AZ::JsonSerializationResult::Processing processing, + const AZ::JsonApplyPatchSettings& settings = AZ::JsonApplyPatchSettings{}) + { + CheckApplyPatchOutcome(target, patch, outcome, processing, settings); + rapidjson::Document expectedPatchedDocument; + expectedPatchedDocument.Parse(expectedPatchedResult); + ASSERT_FALSE(expectedPatchedDocument.HasParseError()); + EXPECT_EQ(AZ::JsonSerialization::Compare(expectedPatchedDocument, *m_jsonDocument), AZ::JsonSerializerCompareResult::Equal); + } + void CheckCreatePatch_Core(const char* source, AZStd::string_view patch, const char* target, AZ::JsonMergeApproach approach) { @@ -262,6 +280,36 @@ namespace JsonSerializationTests Outcomes::TypeMismatch, Processing::Halted); } + TEST_F(JsonPatchingSerializationTests, ApplyPatch_UseJsonPatchWithCustomReportingCallback_ReportPartialSkip) + { + using namespace AZ::JsonSerializationResult; + auto issueReportingCallback = [](AZStd::string_view, AZ::JsonSerializationResult::ResultCode result, + AZStd::string_view) -> AZ::JsonSerializationResult::ResultCode + { + using namespace AZ::JsonSerializationResult; + if (result.GetProcessing() == Processing::Halted) + { + return ResultCode(result.GetTask(), Outcomes::PartialSkip); + } + return result; + }; + + AZ::JsonApplyPatchSettings applyPatchSettings; + applyPatchSettings.m_reporting = AZStd::move(issueReportingCallback); + CheckApplyPatchOutcome( + R"({})", + R"([ + { "op": "add", "path": "/nonexistent_key/new_member", "value": "someValue" }, + { "op": "add", "path": "/test", "value": "someValue" } + ])", + R"( + { "test": "someValue" } + )", + Outcomes::PartialSkip, + Processing::Completed, + AZStd::move(applyPatchSettings)); + } + TEST_F(JsonPatchingSerializationTests, ApplyPatch_UseJsonPatchAddUnnamedMember_ReportsSuccess) { CheckApplyPatch( diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp index 720c14ed36..03d4b14190 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp @@ -172,20 +172,23 @@ namespace AzToolsFramework PrefabDom& templateDomReference = m_prefabSystemComponentInterface->FindTemplateDom(templateId); //apply patch to template - AZ::JsonSerializationResult::ResultCode result = AZ::JsonSerialization::ApplyPatch(templateDomReference, - templateDomReference.GetAllocator(), providedPatch, AZ::JsonMergeApproach::JsonPatch); + AZ::JsonSerializationResult::ResultCode result = + PrefabDomUtils::ApplyPatches(templateDomReference, templateDomReference.GetAllocator(), providedPatch); //trigger propagation - if (result.GetOutcome() == AZ::JsonSerializationResult::Outcomes::Success) + if (result.GetOutcome() != AZ::JsonSerializationResult::Outcomes::Success) { - m_prefabSystemComponentInterface->SetTemplateDirtyFlag(templateId, true); - m_prefabSystemComponentInterface->PropagateTemplateChanges(templateId, instanceToExclude); - return true; + AZ_Error("Prefab", false, "Patch was not successfully applied."); + return false; } else { - AZ_Error("Prefab", false, "Patch was not successfully applied"); - return false; + AZ_Error( + "Prefab", result.GetOutcome() != AZ::JsonSerializationResult::Outcomes::PartialSkip, + "Some of the patches are not successfully applied."); + m_prefabSystemComponentInterface->SetTemplateDirtyFlag(templateId, true); + m_prefabSystemComponentInterface->PropagateTemplateChanges(templateId, instanceToExclude); + return true; } } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp index 1d27fa6375..333c3f2dbc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Link/Link.cpp @@ -176,12 +176,17 @@ namespace AzToolsFramework } else { - AZ::JsonSerializationResult::ResultCode applyPatchResult = AZ::JsonSerialization::ApplyPatch( - sourceTemplateDomCopy, - targetTemplatePrefabDom.GetAllocator(), - patchesReference->get(), - AZ::JsonMergeApproach::JsonPatch); + AZ::JsonSerializationResult::ResultCode applyPatchResult = + PrefabDomUtils::ApplyPatches(sourceTemplateDomCopy, targetTemplatePrefabDom.GetAllocator(), patchesReference->get()); linkedInstanceDom.CopyFrom(sourceTemplateDomCopy, targetTemplatePrefabDom.GetAllocator()); + + PrefabDomValueReference sourceTemplateName = + PrefabDomUtils::FindPrefabDomValue(sourceTemplateDomCopy, PrefabDomUtils::SourceName); + AZ_Assert(sourceTemplateName && sourceTemplateName->get().IsString(), "A valid source template name couldn't be found"); + PrefabDomValueReference targetTemplateName = + PrefabDomUtils::FindPrefabDomValue(targetTemplatePrefabDom, PrefabDomUtils::SourceName); + AZ_Assert(targetTemplateName && targetTemplateName->get().IsString(), "A valid target template name couldn't be found"); + if (applyPatchResult.GetProcessing() != AZ::JsonSerializationResult::Processing::Completed) { AZ_Error( @@ -190,6 +195,14 @@ namespace AzToolsFramework m_sourceTemplateId, m_targetTemplateId); return false; } + if (applyPatchResult.GetOutcome() == AZ::JsonSerializationResult::Outcomes::PartialSkip) + { + AZ_Error( + "Prefab", false, + "Link::UpdateTarget - Some of the patches couldn't be applied on the source template '%s' present under the " + "target Template '%s'.", + sourceTemplateName->get().GetString(), targetTemplateName->get().GetString()); + } } // This is a guardrail to ensure the linked instance dom always has the LinkId value diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp index bac63d94b4..86137ae547 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.cpp @@ -236,6 +236,26 @@ namespace AzToolsFramework return findInstancesResult->get(); } + AZ::JsonSerializationResult::ResultCode ApplyPatches( + PrefabDomValue& prefabDomToApplyPatchesOn, PrefabDom::AllocatorType& allocator, const PrefabDomValue& patches) + { + auto issueReportingCallback = [](AZStd::string_view, AZ::JsonSerializationResult::ResultCode result, + AZStd::string_view) -> AZ::JsonSerializationResult::ResultCode + { + using namespace AZ::JsonSerializationResult; + if (result.GetProcessing() == Processing::Halted) + { + return ResultCode(result.GetTask(), Outcomes::PartialSkip); + } + return result; + }; + + AZ::JsonApplyPatchSettings applyPatchSettings; + applyPatchSettings.m_reporting = AZStd::move(issueReportingCallback); + return AZ::JsonSerialization::ApplyPatch( + prefabDomToApplyPatchesOn, allocator, patches, AZ::JsonMergeApproach::JsonPatch, applyPatchSettings); + } + void PrintPrefabDomValue( [[maybe_unused]] const AZStd::string_view printMessage, [[maybe_unused]] const PrefabDomValue& prefabDomValue) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h index 709461022e..4d4b7a3e32 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabDomUtils.h @@ -7,6 +7,7 @@ #pragma once +#include #include #include #include @@ -122,6 +123,11 @@ namespace AzToolsFramework */ PrefabDomValueConstReference GetInstancesValue(const PrefabDomValue& prefabDom); + AZ::JsonSerializationResult::ResultCode ApplyPatches( + PrefabDomValue& prefabDomToApplyPatchesOn, + PrefabDom::AllocatorType& allocator, + const PrefabDomValue& patches); + /** * Prints the contents of the given prefab DOM value to the debug output console in a readable format. * @param printMessage The message that will be printed before printing the PrefabDomValue diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp index e29c33a21f..728b95f74b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp @@ -261,8 +261,13 @@ namespace AzToolsFramework instanceDom.CopyFrom(instanceDomRef->get(), instanceDom.GetAllocator()); //apply the patch to the template within the target - AZ::JsonSerializationResult::ResultCode result = AZ::JsonSerialization::ApplyPatch(instanceDom, - instanceDom.GetAllocator(), patch, AZ::JsonMergeApproach::JsonPatch); + AZ::JsonSerializationResult::ResultCode result = PrefabDomUtils::ApplyPatches(instanceDom, instanceDom.GetAllocator(), patch); + + AZ_Error( + "Prefab", + result.GetOutcome() != AZ::JsonSerializationResult::Outcomes::PartialSkip && + result.GetOutcome() != AZ::JsonSerializationResult::Outcomes::Success, + "Some of the patches are not successfully applied."); //remove the link id placed into the instance auto linkIdIter = instanceDom.FindMember(PrefabDomUtils::LinkIdName); diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp index cdc5faaef0..253671189d 100644 --- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUndoLinkTests.cpp @@ -96,8 +96,8 @@ namespace UnitTest //apply the patch PrefabDom& templateDomReference = m_prefabSystemComponent->FindTemplateDom(nestedTemplateId); - AZ::JsonSerializationResult::ResultCode result = AZ::JsonSerialization::ApplyPatch(templateDomReference, - templateDomReference.GetAllocator(), patch, AZ::JsonMergeApproach::JsonPatch); + AZ::JsonSerializationResult::ResultCode result = + PrefabDomUtils::ApplyPatches(templateDomReference, templateDomReference.GetAllocator(), patch); AZ_Error("Prefab", result.GetOutcome() == AZ::JsonSerializationResult::Outcomes::Success, "Patch was not successfully applied"); From aeae1555febd5a8117f06f56d01f4c4d8c9ea184 Mon Sep 17 00:00:00 2001 From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com> Date: Mon, 12 Jul 2021 12:29:27 -0700 Subject: [PATCH 023/300] [installer/2106-3p-license-fix] fixed issue with CrashHandler requiring 4-component version strings Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com> --- Code/Tools/CrashHandler/CMakeLists.txt | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Code/Tools/CrashHandler/CMakeLists.txt b/Code/Tools/CrashHandler/CMakeLists.txt index 22d37b2c5d..86e030bd69 100644 --- a/Code/Tools/CrashHandler/CMakeLists.txt +++ b/Code/Tools/CrashHandler/CMakeLists.txt @@ -38,8 +38,19 @@ ly_add_target( string(REPLACE "." ";" version_list "${LY_VERSION_STRING}") list(GET version_list 0 EXE_VERSION_INFO_0) list(GET version_list 1 EXE_VERSION_INFO_1) -list(GET version_list 2 EXE_VERSION_INFO_2) -list(GET version_list 3 EXE_VERSION_INFO_3) + +list(LENGTH version_list version_component_count) +if(${version_component_count} GREATER_EQUAL 3) + list(GET version_list 2 EXE_VERSION_INFO_2) +else() + set(EXE_VERSION_INFO_2 0) +endif() + +if(${version_component_count} GREATER_EQUAL 4) + list(GET version_list 3 EXE_VERSION_INFO_3) +else() + set(EXE_VERSION_INFO_3 0) +endif() ly_add_source_properties( SOURCES Shared/CrashHandler.cpp From afe661cacd58f20bb730ffde0775c9deb4bfa5cf Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 13:39:30 -0700 Subject: [PATCH 024/300] Add support for VS2022 (#2065) * Add generation code for VS, cleanup Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Remove unused code and fixed comments of what is supported Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> * Code review comments Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Common/MSVC/Configurations_msvc.cmake | 41 ++++--------------- .../Platform/Common/VisualStudio_common.cmake | 21 ++++------ 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake index 1850bec114..8b3a1eee49 100644 --- a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake +++ b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake @@ -8,39 +8,16 @@ include(cmake/Platform/Common/Configurations_common.cmake) include(cmake/Platform/Common/VisualStudio_common.cmake) -set(LY_MSVC_SUPPORTED_GENERATORS - "Visual Studio 15" - "Visual Studio 16" -) -set(FOUND_SUPPORTED_GENERATOR) -foreach(supported_generator ${LY_MSVC_SUPPORTED_GENERATORS}) - if(CMAKE_GENERATOR MATCHES ${supported_generator}) - set(FOUND_SUPPORTED_GENERATOR TRUE) - break() - endif() -endforeach() -# VS2017's checks since it defaults the toolchain and target architecture to x86 -if(CMAKE_GENERATOR MATCHES "Visual Studio 15") - if(CMAKE_VS_PLATFORM_NAME AND CMAKE_VS_PLATFORM_NAME STREQUAL "Win32") # VS2017 has Win32 as the default architecture - message(FATAL_ERROR "Win32 architecture not supported, specify \"-A x64\" when invoking cmake") - endif() - if(NOT CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE STREQUAL "x64") # There is at least one library (EditorLib) that make the x86 linker to run out of memory - message(FATAL_ERROR "x86 toolset not supported, specify \"-T host=x64\" when invoking cmake") - endif() -else() - # For the other cases, verify that it wasn't invoked with an unsupported architecture. defaults to x86 architecture - if(SUPPORTED_VS_PLATFORM_NAME_OVERRIDE) - set(SUPPORTED_VS_PLATFORM_NAME ${SUPPORTED_VS_PLATFORM_NAME_OVERRIDE}) - else() - set(SUPPORTED_VS_PLATFORM_NAME x64) - endif() +if(NOT CMAKE_GENERATOR MATCHES "Visual Studio 1[6-7]") + message(FATAL_ERROR "Generator ${CMAKE_GENERATOR} not supported") +endif() - if(CMAKE_VS_PLATFORM_NAME AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "${SUPPORTED_VS_PLATFORM_NAME}") - message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} architecture not supported") - endif() - if(CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE AND NOT CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE STREQUAL "x64") - message(FATAL_ERROR "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE} toolset not supported") - endif() +# Verify that it wasn't invoked with an unsupported target/host architecture. Currently only supports x64/x64 +if(CMAKE_VS_PLATFORM_NAME AND NOT CMAKE_VS_PLATFORM_NAME STREQUAL "x64") + message(FATAL_ERROR "${CMAKE_VS_PLATFORM_NAME} target architecture is not supported, it must be 'x64'") +endif() +if(CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE AND NOT CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE STREQUAL "x64") + message(FATAL_ERROR "${CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE} host toolset is not supported, it must be 'x64'") endif() ly_append_configurations_options( diff --git a/cmake/Platform/Common/VisualStudio_common.cmake b/cmake/Platform/Common/VisualStudio_common.cmake index 91817bef6f..982d32f558 100644 --- a/cmake/Platform/Common/VisualStudio_common.cmake +++ b/cmake/Platform/Common/VisualStudio_common.cmake @@ -5,16 +5,13 @@ # # -if(CMAKE_GENERATOR MATCHES "Visual Studio 16") +foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) + if(conf STREQUAL debug) + string(APPEND VCPKG_CONFIGURATION_MAPPING " Debug\n") + else() + string(APPEND VCPKG_CONFIGURATION_MAPPING " Release\n") + endif() +endforeach() + +configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_BINARY_DIR}/Directory.Build.props" @ONLY) - foreach(conf IN LISTS CMAKE_CONFIGURATION_TYPES) - if(conf STREQUAL debug) - string(APPEND VCPKG_CONFIGURATION_MAPPING " Debug\n") - else() - string(APPEND VCPKG_CONFIGURATION_MAPPING " Release\n") - endif() - endforeach() - - configure_file("${CMAKE_CURRENT_LIST_DIR}/Directory.Build.props" "${CMAKE_BINARY_DIR}/Directory.Build.props" @ONLY) - -endif() \ No newline at end of file From 6d2fbacda51372fd4c482f28a100be569c6da798 Mon Sep 17 00:00:00 2001 From: scspaldi Date: Mon, 12 Jul 2021 13:43:41 -0700 Subject: [PATCH 025/300] Added Lua Editor window to kill process list. Signed-off-by: scspaldi --- Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py index 2b6ff8292e..d108140977 100644 --- a/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py +++ b/Tools/LyTestTools/ly_test_tools/o3de/asset_processor_utils.py @@ -45,4 +45,5 @@ def kill_asset_processor(): kill_processes_named('AssetProcessorBatch', ignore_extensions=True) kill_processes_named('AssetBuilder', ignore_extensions=True) kill_processes_named('rc', ignore_extensions=True) + kill_processes_named('Lua Editor', ignore_extensions=True) From c494adba885c5624d9bbb829e115c9004fc95ac1 Mon Sep 17 00:00:00 2001 From: srikappa Date: Mon, 12 Jul 2021 14:21:04 -0700 Subject: [PATCH 026/300] Use a utility function to compare json document and expected string Signed-off-by: srikappa --- .../AzCore/Tests/Serialization/Json/TestCases_Patching.cpp | 5 +---- .../AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp index 046bb88d76..15c3c8f71b 100644 --- a/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp +++ b/Code/Framework/AzCore/Tests/Serialization/Json/TestCases_Patching.cpp @@ -71,10 +71,7 @@ namespace JsonSerializationTests const AZ::JsonApplyPatchSettings& settings = AZ::JsonApplyPatchSettings{}) { CheckApplyPatchOutcome(target, patch, outcome, processing, settings); - rapidjson::Document expectedPatchedDocument; - expectedPatchedDocument.Parse(expectedPatchedResult); - ASSERT_FALSE(expectedPatchedDocument.HasParseError()); - EXPECT_EQ(AZ::JsonSerialization::Compare(expectedPatchedDocument, *m_jsonDocument), AZ::JsonSerializerCompareResult::Equal); + Expect_DocStrEq(expectedPatchedResult); } void CheckCreatePatch_Core(const char* source, AZStd::string_view patch, const char* target, diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp index 728b95f74b..7d9fb64c96 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabUndo.cpp @@ -265,8 +265,8 @@ namespace AzToolsFramework AZ_Error( "Prefab", - result.GetOutcome() != AZ::JsonSerializationResult::Outcomes::PartialSkip && - result.GetOutcome() != AZ::JsonSerializationResult::Outcomes::Success, + result.GetOutcome() == AZ::JsonSerializationResult::Outcomes::PartialSkip || + result.GetOutcome() == AZ::JsonSerializationResult::Outcomes::Success, "Some of the patches are not successfully applied."); //remove the link id placed into the instance From 86a6d75b40362b287cf8e7dbe28c14f98aa17f2b Mon Sep 17 00:00:00 2001 From: srikappa Date: Mon, 12 Jul 2021 15:01:11 -0700 Subject: [PATCH 027/300] Remove an additional check during patch application to report errors Signed-off-by: srikappa --- .../AzCore/AzCore/Serialization/Json/JsonMerger.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp index 51e47840c9..61869b7eb5 100644 --- a/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp +++ b/Code/Framework/AzCore/AzCore/Serialization/Json/JsonMerger.cpp @@ -110,15 +110,7 @@ namespace AZ if (result.GetProcessing() == Processing::Halted) { - ResultCode reportedResult = settings.m_reporting(R"(One of the patches couldn't be applied correctly.)", result, element); - if (reportedResult.GetOutcome() == Outcomes::PartialSkip) - { - result = reportedResult; - } - else - { - return result; - } + return result; } } From 12a8cc7cd75edabb235086e92be2ab93eb673117 Mon Sep 17 00:00:00 2001 From: evanchia Date: Mon, 12 Jul 2021 15:31:09 -0700 Subject: [PATCH 028/300] Removing deleted test from CMakeLists and updated in line comments for sample test Signed-off-by: evanchia --- Tools/LyTestTools/tests/CMakeLists.txt | 14 ---------- Tools/LyTestTools/tests/integ/sanity_tests.py | 26 +++++++++++++++++++ 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/Tools/LyTestTools/tests/CMakeLists.txt b/Tools/LyTestTools/tests/CMakeLists.txt index e5f270197c..5e57cbf123 100644 --- a/Tools/LyTestTools/tests/CMakeLists.txt +++ b/Tools/LyTestTools/tests/CMakeLists.txt @@ -52,18 +52,4 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS AND PAL_TRAIT_BUILD_TESTS_SUPPORTED AND AutomatedT AutomatedTesting.Assets COMPONENT TestTools ) - - # Example tests. - ly_add_pytest( - NAME LyTestTools_ExampleTests_periodic_no_gpu - PATH ${CMAKE_CURRENT_LIST_DIR}/example/test_system_example.py - TEST_SERIAL - TEST_SUITE periodic - RUNTIME_DEPENDENCIES - Legacy::Editor - AssetProcessor - AutomatedTesting.GameLauncher - AutomatedTesting.Assets - COMPONENT TestTools - ) endif() diff --git a/Tools/LyTestTools/tests/integ/sanity_tests.py b/Tools/LyTestTools/tests/integ/sanity_tests.py index 0aacfff8c6..f68bc9ae57 100755 --- a/Tools/LyTestTools/tests/integ/sanity_tests.py +++ b/Tools/LyTestTools/tests/integ/sanity_tests.py @@ -6,24 +6,43 @@ SPDX-License-Identifier: Apache-2.0 OR MIT A sanity test for the built-in fixtures. Launch the windows launcher attached to the currently installed instance. """ +# Import any dependencies for the test. import logging import pytest +# Import any desired LTT modules from the package `ly_test_tools`. All LTT modules can be viewed at `Tools/LyTestTools/ly_test_tools`. import ly_test_tools +# The `launchers.launcher_helper` module helps create Launcher objects which control the Open 3D Engine (O3DE) Editor and game clients. import ly_test_tools.launchers.launcher_helper as launcher_helper +# The `builtin.helpers` module helps create the Workspace object, which controls the testing workspace in LTT. import ly_test_tools.builtin.helpers as helpers +# The `environment` module contains tools that involve the system's environment such as processes or timed waiters. import ly_test_tools.environment.process_utils as process_utils import ly_test_tools.environment.waiter as waiter +# Initialize a logger instance to hook all test logs together. The sub-logger pattern below makes it easy to track which file creates a log line. logger = logging.getLogger(__name__) # Note: For device testing, device ids must exist in ~/ly_test_tools/devices.ini, see README.txt for more info. +# First define the class `TestAutomatedTestingProject` to group test functions together. +# The example test contains two test functions: `test_StartGameLauncher_Sanity` and `test_StartEditor_Sanity`. @pytest.mark.parametrize("project", ["AutomatedTesting"]) +# The example test utilizes Pytest parameterization. The following sets the `project` parameter to `AutomatedTesting` +# for both test functions. Notice that the Pytest mark is defined at the class level to affect both test functions. class TestAutomatedTestingProject(object): def test_StartGameLauncher_Sanity(self, project): + """ + The `test_StartGameLauncher_Sanity` test function verifies that the O3DE game client launches successfully. + Start the test by utilizing the `kill_processes_named` function to close any open O3DE processes that may + interfere with the test. The Workspace object emulates the O3DE package by locating the engine and project + directories. The Launcher object controls the O3DE game client and requires a Workspace object for + initialization. Add the `-rhi=Null` arg to the executable call to disable GPU rendering. This allows the + test to run on instances without a GPU. We launch the game client executable and wait for the process to exist. + A try/finally block ensures proper test cleanup if issues occur during the test. + """ # Kill processes that may interfere with the test process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True) @@ -45,6 +64,13 @@ class TestAutomatedTestingProject(object): @pytest.mark.skipif(not ly_test_tools.WINDOWS, reason="Editor currently only functions on Windows") def test_StartEditor_Sanity(self, project): + """ + The `test_StartEditor_Sanity` test function is similar to the previous example with minor adjustments. A + PyTest mark skips the test if the operating system is not Windows. We use the `create_editor` function instead + of `create_launcher` to create an Editor type launcher instead of a game client type launcher. The additional + `-autotest_mode` arg supresses modal dialogs from interfering with our test. We launch the Editor executable and + wait for the process to exist. + """ # Kill processes that may interfere with the test process_utils.kill_processes_named(names=process_utils.LY_PROCESS_KILL_LIST, ignore_extensions=True) From 23f690cd55c74b73661955176b444971fbf52e95 Mon Sep 17 00:00:00 2001 From: Shirang Jia Date: Mon, 12 Jul 2021 16:58:33 -0700 Subject: [PATCH 029/300] Cleanup incremental build scripts (#2004) * Cleanup incremental build scripts Signed-off-by: shiranj * Fix timeout function since signal.SIGALRM is not available on Windows Signed-off-by: shiranj * Convert missing fstrings Signed-off-by: shiranj * Add PipelineAndBranch back to EBS volume tag Signed-off-by: shiranj --- .../build/bootstrap/incremental_build_util.py | 308 +++++++++--------- 1 file changed, 162 insertions(+), 146 deletions(-) diff --git a/scripts/build/bootstrap/incremental_build_util.py b/scripts/build/bootstrap/incremental_build_util.py index 32a6b0f526..296fbb5424 100755 --- a/scripts/build/bootstrap/incremental_build_util.py +++ b/scripts/build/bootstrap/incremental_build_util.py @@ -4,18 +4,18 @@ # import argparse -import ast import boto3 import datetime import urllib.request, urllib.error, urllib.parse import os import psutil import time -import requests import subprocess import sys import tempfile -import traceback +from contextlib import contextmanager +import threading +import _thread DEFAULT_REGION = 'us-west-2' DEFAULT_DISK_SIZE = 300 @@ -42,14 +42,18 @@ if os.name == 'nt': kernel32 = ctypes.WinDLL('kernel32', use_last_error=True) kernel32.GetDiskFreeSpaceExW.argtypes = (ctypes.c_wchar_p,) + (PULARGE_INTEGER,) * 3 + class UsageTuple(collections.namedtuple('UsageTuple', 'total, used, free')): def __str__(self): # Add thousands separator to numbers displayed return self.__class__.__name__ + '(total={:n}, used={:n}, free={:n})'.format(*self) + def is_dir_symlink(path): FILE_ATTRIBUTE_REPARSE_POINT = 0x0400 - return os.path.isdir(path) and (ctypes.windll.kernel32.GetFileAttributesW(str(path)) & FILE_ATTRIBUTE_REPARSE_POINT) + return os.path.isdir(path) and ( + ctypes.windll.kernel32.GetFileAttributesW(str(path)) & FILE_ATTRIBUTE_REPARSE_POINT) + def get_free_space_mb(path): if sys.version_info < (3,): # Python 2? @@ -77,16 +81,39 @@ if os.name == 'nt': used = total.value - free.value - return free.value / 1024 / 1024#for now + return free.value / 1024 / 1024 # for now else: def get_free_space_mb(dirname): st = os.statvfs(dirname) return st.f_bavail * st.f_frsize / 1024 / 1024 + def error(message): print(message) exit(1) + +@contextmanager +def timeout(duration, timeout_message): + timer = threading.Timer(duration, lambda: _thread.interrupt_main()) + timer.start() + try: + yield + except KeyboardInterrupt: + print(timeout_message) + raise TimeoutError + finally: + # If the action ends in specified time, timer is canceled + timer.cancel() + + +def print_drives(): + if os.name == 'nt': + drives_before = win32api.GetLogicalDriveStrings() + drives_before = drives_before.split('\000')[:-1] + print(drives_before) + + def parse_args(): parser = argparse.ArgumentParser() parser.add_argument('-a', '--action', dest="action", help="Action (mount|unmount|delete)") @@ -96,8 +123,10 @@ def parse_args(): parser.add_argument('-b', '--branch', dest="branch", help="Branch") parser.add_argument('-plat', '--platform', dest="platform", help="Platform") parser.add_argument('-c', '--build_type', dest="build_type", help="Build type") - parser.add_argument('-ds', '--disk_size', dest="disk_size", help="Disk size in Gigabytes (defaults to {})".format(DEFAULT_DISK_SIZE), default=DEFAULT_DISK_SIZE) - parser.add_argument('-dt', '--disk_type', dest="disk_type", help="Disk type (defaults to {})".format(DEFAULT_DISK_TYPE), default=DEFAULT_DISK_TYPE) + parser.add_argument('-ds', '--disk_size', dest="disk_size", + help=f"Disk size in Gigabytes (defaults to {DEFAULT_DISK_SIZE})", default=DEFAULT_DISK_SIZE) + parser.add_argument('-dt', '--disk_type', dest="disk_type", help=f"Disk type (defaults to {DEFAULT_DISK_TYPE})", + default=DEFAULT_DISK_TYPE) args = parser.parse_args() # Input validation @@ -117,19 +146,30 @@ def parse_args(): error('No platform specified') if args.build_type is None: error('No build_type specified') - + return args + def get_mount_name(repository_name, project, pipeline, branch, platform, build_type): - mount_name = "{}_{}_{}_{}_{}_{}".format(repository_name, project, pipeline, branch, platform, build_type) - mount_name = mount_name.replace('/','_').replace('\\','_') + mount_name = f"{repository_name}_{project}_{pipeline}_{branch}_{platform}_{build_type}" + mount_name = mount_name.replace('/', '_').replace('\\', '_') return mount_name + def get_pipeline_and_branch(pipeline, branch): - pipeline_and_branch = "{}_{}".format(pipeline, branch) - pipeline_and_branch = pipeline_and_branch.replace('/','_').replace('\\','_') + pipeline_and_branch = f"{pipeline}_{branch}" + pipeline_and_branch = pipeline_and_branch.replace('/', '_').replace('\\', '_') return pipeline_and_branch + +def get_region_name(): + session = boto3.session.Session() + region = session.region_name + if region is None: + region = DEFAULT_REGION + return region + + def get_ec2_client(region): client = boto3.client('ec2', region_name=region) return client @@ -140,48 +180,51 @@ def get_ec2_instance_id(): instance_id = urllib.request.urlopen('http://169.254.169.254/latest/meta-data/instance-id').read() return instance_id.decode("utf-8") except Exception as e: - print(e.message) + print(e) error('No EC2 metadata! Check if you are running this script on an EC2 instance.') def get_availability_zone(): try: - availability_zone = urllib.request.urlopen('http://169.254.169.254/latest/meta-data/placement/availability-zone').read() + availability_zone = urllib.request.urlopen( + 'http://169.254.169.254/latest/meta-data/placement/availability-zone').read() return availability_zone.decode("utf-8") except Exception as e: - print(e.message) + print(e) error('No EC2 metadata! Check if you are running this script on an EC2 instance.') def kill_processes(workspace='/dev/'): - ''' + """ Kills all processes that have open file paths associated with the workspace. Uses PSUtil for cross-platform compatibility - ''' + """ print('Checking for any stuck processes...') for proc in psutil.process_iter(): try: if workspace in str(proc.open_files()): - print("{} has open files in {}. Terminating".format(proc.name(), proc.open_files())) + print(f"{proc.name()} has open files in {proc.open_files()}. Terminating") proc.kill() - time.sleep(1) # Just to make sure a parent process has time to close + time.sleep(1) # Just to make sure a parent process has time to close except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess): continue def delete_volume(ec2_client, volume_id): response = ec2_client.delete_volume(VolumeId=volume_id) - print('Volume {} deleted'.format(volume_id)) + print(f'Volume {volume_id} deleted') + def find_snapshot_id(ec2_client, repository_name, project, pipeline, platform, build_type, disk_size): - mount_name = get_mount_name(repository_name, project, pipeline, 'stabilization_2106', platform, build_type) # we take snapshots out of stabilization_2106 - response = ec2_client.describe_snapshots(Filters= [{ + mount_name = get_mount_name(repository_name, project, pipeline, 'stabilization_2106', platform, + build_type) # we take snapshots out of stabilization_2106 + response = ec2_client.describe_snapshots(Filters=[{ 'Name': 'tag:Name', 'Values': [mount_name] }]) snapshot_id = None if 'Snapshots' in response and len(response['Snapshots']) > 0: - snapshot_start_time_max = None # find the latest snapshot + snapshot_start_time_max = None # find the latest snapshot for snapshot in response['Snapshots']: if snapshot['State'] == 'completed' and snapshot['VolumeSize'] == disk_size: snapshot_start_time = snapshot['StartTime'] @@ -190,28 +233,33 @@ def find_snapshot_id(ec2_client, repository_name, project, pipeline, platform, b snapshot_id = snapshot['SnapshotId'] return snapshot_id -def create_volume(ec2_client, availability_zone, repository_name, project, pipeline, branch, platform, build_type, disk_size, disk_type): - # The actual EBS default calculation for IOps is a floating point number, the closest approxmiation is 4x of the disk size for simplicity + +def create_volume(ec2_client, availability_zone, repository_name, project, pipeline, branch, platform, build_type, + disk_size, disk_type): mount_name = get_mount_name(repository_name, project, pipeline, branch, platform, build_type) - pipeline_and_branch = get_pipeline_and_branch(pipeline, branch) + pipeline_and_branch = get_pipeline_and_branch(pipeline, branch) parameters = dict( - AvailabilityZone = availability_zone, + AvailabilityZone=availability_zone, VolumeType=disk_type, - TagSpecifications= [{ + TagSpecifications=[{ 'ResourceType': 'volume', 'Tags': [ - { 'Key': 'Name', 'Value': mount_name }, - { 'Key': 'RepositoryName', 'Value': repository_name}, - { 'Key': 'Project', 'Value': project }, - { 'Key': 'Pipeline', 'Value': pipeline }, - { 'Key': 'BranchName', 'Value': branch }, - { 'Key': 'Platform', 'Value': platform }, - { 'Key': 'BuildType', 'Value': build_type }, - { 'Key': 'PipelineAndBranch', 'Value': pipeline_and_branch }, # used so the snapshoting easily identifies which volumes to snapshot + {'Key': 'Name', 'Value': mount_name}, + {'Key': 'RepositoryName', 'Value': repository_name}, + {'Key': 'Project', 'Value': project}, + {'Key': 'Pipeline', 'Value': pipeline}, + {'Key': 'BranchName', 'Value': branch}, + {'Key': 'Platform', 'Value': platform}, + {'Key': 'BuildType', 'Value': build_type}, + # Used so the snapshoting easily identifies which volumes to snapshot + {'Key': 'PipelineAndBranch', 'Value': pipeline_and_branch}, + ] }] ) - if 'io1' in disk_type.lower(): + # The actual EBS default calculation for IOps is a floating point number, + # the closest approxmiation is 4x of the disk size for simplicity + if 'io1' in disk_type.lower(): parameters['Iops'] = (4 * disk_size) snapshot_id = find_snapshot_id(ec2_client, repository_name, project, pipeline, platform, build_type, disk_size) @@ -230,16 +278,17 @@ def create_volume(ec2_client, availability_zone, repository_name, project, pipel time.sleep(1) response = ec2_client.describe_volumes(VolumeIds=[volume_id, ]) - while (response['Volumes'][0]['State'] != 'available'): - time.sleep(1) - response = ec2_client.describe_volumes(VolumeIds=[volume_id, ]) + with timeout(DEFAULT_TIMEOUT, 'ERROR: Timeout reached trying to create EBS.'): + while response['Volumes'][0]['State'] != 'available': + time.sleep(1) + response = ec2_client.describe_volumes(VolumeIds=[volume_id, ]) - print(("Volume {} created\n\tSnapshot: {}\n\tRepository {}\n\tProject {}\n\tPipeline {}\n\tBranch {}\n\tPlatform: {}\n\tBuild type: {}" - .format(volume_id, snapshot_id, repository_name, project, pipeline, branch, platform, build_type))) + print(f"Volume {volume_id} created\n\tSnapshot: {snapshot_id}\n\tRepository {repository_name}\n\t" + f"Project {project}\n\tPipeline {pipeline}\n\tBranch {branch}\n\tPlatform: {platform}\n\tBuild type: {build_type}") return volume_id, created -def mount_volume(created): +def mount_volume_to_device(created): print('Mounting volume...') if os.name == 'nt': f = tempfile.NamedTemporaryFile(delete=False) @@ -247,7 +296,7 @@ def mount_volume(created): select disk 1 online disk attribute disk clear readonly - """.encode('utf-8')) # assume disk # for now + """.encode('utf-8')) # assume disk # for now if created: print('Creating filesystem on new volume') @@ -259,18 +308,12 @@ def mount_volume(created): """.encode('utf-8')) f.close() - + subprocess.call(['diskpart', '/s', f.name]) time.sleep(5) - drives_after = win32api.GetLogicalDriveStrings() - drives_after = drives_after.split('\000')[:-1] - - print(drives_after) - - #drive_letter = next(item for item in drives_after if item not in drives_before) - drive_letter = MOUNT_PATH + print_drives() os.unlink(f.name) @@ -283,8 +326,8 @@ def mount_volume(created): subprocess.call(['mount', '/dev/xvdf', MOUNT_PATH]) -def attach_volume(volume, volume_id, instance_id, timeout=DEFAULT_TIMEOUT): - print('Attaching volume {} to instance {}'.format(volume_id, instance_id)) +def attach_volume_to_ec2_instance(volume, volume_id, instance_id, timeout_duration=DEFAULT_TIMEOUT): + print(f'Attaching volume {volume_id} to instance {instance_id}') volume.attach_to_instance(Device='xvdf', InstanceId=instance_id, VolumeId=volume_id) @@ -292,13 +335,10 @@ def attach_volume(volume, volume_id, instance_id, timeout=DEFAULT_TIMEOUT): time.sleep(2) # reload the volume just in case volume.load() - timeout_init = time.clock() - while (len(volume.attachments) and volume.attachments[0]['State'] != 'attached'): - time.sleep(1) - volume.load() - if (time.clock() - timeout_init) > timeout: - print('ERROR: Timeout reached trying to mount EBS') - exit(1) + with timeout(timeout_duration, 'ERROR: Timeout reached trying to mount EBS.'): + while len(volume.attachments) and volume.attachments[0]['State'] != 'attached': + time.sleep(1) + volume.load() volume.create_tags( Tags=[ { @@ -307,11 +347,11 @@ def attach_volume(volume, volume_id, instance_id, timeout=DEFAULT_TIMEOUT): }, ] ) - print('Volume {} has been attached to instance {}'.format(volume_id, instance_id)) + print(f'Volume {volume_id} has been attached to instance {instance_id}') -def unmount_volume(): - print('Umounting volume...') +def unmount_volume_from_device(): + print('Unmounting EBS volume from device...') if os.name == 'nt': kill_processes(MOUNT_PATH + 'workspace') f = tempfile.NamedTemporaryFile(delete=False) @@ -327,50 +367,31 @@ def unmount_volume(): subprocess.call(['umount', '-f', MOUNT_PATH]) -def detach_volume(volume, ec2_instance_id, force, timeout=DEFAULT_TIMEOUT): - print('Detaching volume {} from instance {}'.format(volume.volume_id, ec2_instance_id)) +def detach_volume_from_ec2_instance(volume, ec2_instance_id, force, timeout_duration=DEFAULT_TIMEOUT): + print(f'Detaching volume {volume.volume_id} from instance {ec2_instance_id}') volume.detach_from_instance(Device='xvdf', Force=force, InstanceId=ec2_instance_id, VolumeId=volume.volume_id) - timeout_init = time.clock() - while len(volume.attachments) and volume.attachments[0]['State'] != 'detached': - time.sleep(1) - volume.load() - if (time.clock() - timeout_init) > timeout: - print('ERROR: Timeout reached trying to unmount EBS.') - volume.detach_from_instance(Device='xvdf',Force=True,InstanceId=ec2_instance_id,VolumeId=volume.volume_id) - exit(1) - - print('Volume {} has been detached from instance {}'.format(volume.volume_id, ec2_instance_id)) + try: + with timeout(timeout_duration, 'ERROR: Timeout reached trying to unmount EBS.'): + while len(volume.attachments) and volume.attachments[0]['State'] != 'detached': + time.sleep(1) + volume.load() + except TimeoutError: + print('Force detaching EBS.') + volume.detach_from_instance(Device='xvdf', Force=True, InstanceId=ec2_instance_id, VolumeId=volume.volume_id) + + print(f'Volume {volume.volume_id} has been detached from instance {ec2_instance_id}') volume.load() if len(volume.attachments): print('Volume still has attachments') for attachment in volume.attachments: - print('Volume {} {} to instance {}'.format(attachment['VolumeId'], attachment['State'], attachment['InstanceId'])) - - -def attach_ebs_and_create_partition_with_retry(volume, volume_id, ec2_instance_id, created): - attach_volume(volume, volume_id, ec2_instance_id) - mount_volume(created) - attempt = 1 - while attempt <= MAX_EBS_MOUNTING_ATTEMPT: - if os.name == 'nt': - drives_after = win32api.GetLogicalDriveStrings() - drives_after = drives_after.split('\000')[:-1] - if MOUNT_PATH not in drives_after: - print('Disk partitioning failed, retrying...') - unmount_volume() - detach_volume(volume, ec2_instance_id, False) - attach_volume(volume, volume_id, ec2_instance_id) - mount_volume(created) - attempt += 1 + print(f"Volume {attachment['VolumeId']} {attachment['State']} to instance {attachment['InstanceId']}") + def mount_ebs(repository_name, project, pipeline, branch, platform, build_type, disk_size, disk_type): - session = boto3.session.Session() - region = session.region_name - if region is None: - region = DEFAULT_REGION + region = get_region_name() ec2_client = get_ec2_client(region) ec2_instance_id = get_ec2_instance_id() ec2_availability_zone = get_availability_zone() @@ -379,70 +400,70 @@ def mount_ebs(repository_name, project, pipeline, branch, platform, build_type, for volume in ec2_instance.volumes.all(): for attachment in volume.attachments: - print('attachment device: {}'.format(attachment['Device'])) + print(f"attachment device: {attachment['Device']}") if 'xvdf' in attachment['Device'] and attachment['State'] != 'detached': - print('A device is already attached to xvdf. This likely means a previous build failed to detach its ' \ + print('A device is already attached to xvdf. This likely means a previous build failed to detach its ' 'build volume. This volume is considered orphaned and will be detached from this instance.') - unmount_volume() - detach_volume(volume, ec2_instance_id, False) # Force unmounts should not be used, as that will cause the EBS block device driver to fail the remount + unmount_volume_from_device() + detach_volume_from_ec2_instance(volume, ec2_instance_id, + False) # Force unmounts should not be used, as that will cause the EBS block device driver to fail the remount mount_name = get_mount_name(repository_name, project, pipeline, branch, platform, build_type) response = ec2_client.describe_volumes(Filters=[{ 'Name': 'tag:Name', 'Values': [mount_name] - }]) + }]) created = False if 'Volumes' in response and not len(response['Volumes']): - print('Volume for {} doesn\'t exist creating it...'.format(mount_name)) + print(f'Volume for {mount_name} doesn\'t exist creating it...') # volume doesn't exist, create it - volume_id, created = create_volume(ec2_client, ec2_availability_zone, repository_name, project, pipeline, branch, platform, build_type, disk_size, disk_type) + volume_id, created = create_volume(ec2_client, ec2_availability_zone, repository_name, project, pipeline, + branch, platform, build_type, disk_size, disk_type) else: volume = response['Volumes'][0] volume_id = volume['VolumeId'] - print('Current volume {} is a {} GB {}'.format(volume_id, volume['Size'], volume['VolumeType'])) - if (volume['Size'] != disk_size or volume['VolumeType'] != disk_type): - print('Override disk attributes does not match the existing volume, deleting {} and replacing the volume'.format(volume_id)) + print(f"Current volume {volume_id} is a {volume['Size']} GB {volume['VolumeType']}") + if volume['Size'] != disk_size or volume['VolumeType'] != disk_type: + print( + f'Override disk attributes does not match the existing volume, deleting {volume_id} and replacing the volume') delete_volume(ec2_client, volume_id) - volume_id, created = create_volume(ec2_client, ec2_availability_zone, repository_name, project, pipeline, branch, platform, build_type, disk_size, disk_type) + volume_id, created = create_volume(ec2_client, ec2_availability_zone, repository_name, project, pipeline, + branch, platform, build_type, disk_size, disk_type) if len(volume['Attachments']): # this is bad we shouldn't be attached, we should have detached at the end of a build attachment = volume['Attachments'][0] - print(('Volume already has attachment {}, detaching...'.format(attachment))) - detach_volume(ec2_resource.Volume(volume_id), attachment['InstanceId'], True) + print(f'Volume already has attachment {attachment}, detaching...') + detach_volume_from_ec2_instance(ec2_resource.Volume(volume_id), attachment['InstanceId'], True) volume = ec2_resource.Volume(volume_id) - if os.name == 'nt': - drives_before = win32api.GetLogicalDriveStrings() - drives_before = drives_before.split('\000')[:-1] - - print(drives_before) - - attach_ebs_and_create_partition_with_retry(volume, volume_id, ec2_instance_id, created) + print_drives() + attach_volume_to_ec2_instance(volume, volume_id, ec2_instance_id) + mount_volume_to_device(created) + print_drives() free_space_mb = get_free_space_mb(MOUNT_PATH) - print('Free disk space {}MB'.format(free_space_mb)) - + print(f'Free disk space {free_space_mb}MB') + if free_space_mb < LOW_EBS_DISK_SPACE_LIMIT: - print('Volume is running below EBS free disk space treshhold {}MB. Recreating volume and running clean build.'.format(LOW_EBS_DISK_SPACE_LIMIT)) - unmount_volume() - detach_volume(volume, ec2_instance_id, False) + print(f'Volume is running below EBS free disk space treshhold {LOW_EBS_DISK_SPACE_LIMIT}MB. Recreating volume and running clean build.') + unmount_volume_from_device() + detach_volume_from_ec2_instance(volume, ec2_instance_id, False) delete_volume(ec2_client, volume_id) new_disk_size = int(volume.size * 1.25) if new_disk_size > MAX_EBS_DISK_SIZE: - print('Error: EBS disk size reached to the allowed maximum disk size {}MB, please contact ly-infra@ and ly-build@ to investigate.'.format(MAX_EBS_DISK_SIZE)) + print(f'Error: EBS disk size reached to the allowed maximum disk size {MAX_EBS_DISK_SIZE}MB, please contact ly-infra@ and ly-build@ to investigate.') exit(1) - print('Recreating the EBS with disk size {}'.format(new_disk_size)) - volume_id, created = create_volume(ec2_client, ec2_availability_zone, repository_name, project, pipeline, branch, platform, build_type, new_disk_size, disk_type) + print(f'Recreating the EBS with disk size {new_disk_size}') + volume_id, created = create_volume(ec2_client, ec2_availability_zone, repository_name, project, pipeline, + branch, platform, build_type, new_disk_size, disk_type) volume = ec2_resource.Volume(volume_id) - attach_ebs_and_create_partition_with_retry(volume, volume_id, ec2_instance_id, created) + attach_volume_to_ec2_instance(volume, volume_id, ec2_instance_id) + mount_volume_to_device(created) + def unmount_ebs(): - session = boto3.session.Session() - region = session.region_name - if region is None: - region = DEFAULT_REGION - ec2_client = get_ec2_client(region) + region = get_region_name() ec2_instance_id = get_ec2_instance_id() ec2_resource = boto3.resource('ec2', region_name=region) ec2_instance = ec2_resource.Instance(ec2_instance_id) @@ -454,7 +475,7 @@ def unmount_ebs(): for attached_volume in ec2_instance.volumes.all(): for attachment in attached_volume.attachments: - print('attachment device: {}'.format(attachment['Device'])) + print(f"attachment device: {attachment['Device']}") if attachment['Device'] == 'xvdf': volume = attached_volume @@ -462,24 +483,18 @@ def unmount_ebs(): # volume is not mounted print('Volume is not mounted') else: - unmount_volume() - detach_volume(volume, ec2_instance_id, False) + unmount_volume_from_device() + detach_volume_from_ec2_instance(volume, ec2_instance_id, False) + def delete_ebs(repository_name, project, pipeline, branch, platform, build_type): unmount_ebs() - - session = boto3.session.Session() - region = session.region_name - if region is None: - region = DEFAULT_REGION + region = get_region_name() ec2_client = get_ec2_client(region) - ec2_instance_id = get_ec2_instance_id() - ec2_resource = boto3.resource('ec2', region_name=region) - ec2_instance = ec2_resource.Instance(ec2_instance_id) mount_name = get_mount_name(repository_name, project, pipeline, branch, platform, build_type) response = ec2_client.describe_volumes(Filters=[ - { 'Name': 'tag:Name', 'Values': [mount_name] } + {'Name': 'tag:Name', 'Values': [mount_name]} ]) if 'Volumes' in response and len(response['Volumes']): @@ -496,7 +511,8 @@ def main(action, repository_name, project, pipeline, branch, platform, build_typ elif action == 'delete': delete_ebs(repository_name, project, pipeline, branch, platform, build_type) + if __name__ == "__main__": args = parse_args() - ret = main(args.action, args.repository_name, args.project, args.pipeline, args.branch, args.platform, args.build_type, args.disk_size, args.disk_type) - sys.exit(ret) \ No newline at end of file + main(args.action, args.repository_name, args.project, args.pipeline, args.branch, args.platform, + args.build_type, args.disk_size, args.disk_type) From afd97abdcfc08b463e248ba4a035fc2d4c3ad470 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 9 Jul 2021 08:07:47 -0700 Subject: [PATCH 030/300] Move files to AzFramework/Test and AzToolsFramework/Test accordingly Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Framework/{ => AzFramework}/Tests/Application.cpp | 0 .../Framework/{ => AzFramework}/Tests/ArchiveCompressionTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/ArchiveTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/AssetCatalog.cpp | 0 .../{ => AzFramework}/Tests/AssetProcessorConnection.cpp | 0 Code/Framework/{ => AzFramework}/Tests/BehaviorEntityTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/BinToTextEncode.cpp | 0 Code/Framework/{ => AzFramework}/Tests/CMakeLists.txt | 0 Code/Framework/{ => AzFramework}/Tests/CameraInputTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/CameraState.cpp | 0 Code/Framework/{ => AzFramework}/Tests/ClickDetectorTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/CursorStateTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/EntityContext.cpp | 0 Code/Framework/{ => AzFramework}/Tests/FileIO.cpp | 0 Code/Framework/{ => AzFramework}/Tests/FileTagTests.cpp | 0 .../{ => AzFramework}/Tests/FrameworkApplicationFixture.h | 0 Code/Framework/{ => AzFramework}/Tests/GenAppDescriptors.cpp | 0 Code/Framework/{ => AzFramework}/Tests/InputTests.cpp | 0 .../Tests/Mocks/MockSpawnableEntitiesInterface.h | 0 Code/Framework/{ => AzFramework}/Tests/NativeWindow.cpp | 0 Code/Framework/{ => AzFramework}/Tests/OctreePerformanceTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/OctreeTests.cpp | 0 .../Tests/Platform/Android/AzFrameworkTests_Traits_Android.h | 0 .../Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/Android/platform_android_files.cmake | 0 .../Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h | 0 .../Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/Linux/platform_linux_files.cmake | 0 .../Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h | 0 .../Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h | 0 .../{ => AzFramework}/Tests/Platform/Mac/platform_mac_files.cmake | 0 .../Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h | 0 .../Tests/Platform/Windows/platform_windows_files.cmake | 0 .../Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h | 0 .../Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h | 0 .../{ => AzFramework}/Tests/Platform/iOS/platform_ios_files.cmake | 0 Code/Framework/{ => AzFramework}/Tests/PlatformHelper.cpp | 0 Code/Framework/{ => AzFramework}/Tests/ProcessLaunchMain.cpp | 0 .../Framework/{ => AzFramework}/Tests/ProcessLaunchParseTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/Scene.cpp | 0 .../Tests/Spawnable/SpawnableEntitiesManagerTests.cpp | 0 Code/Framework/{ => AzFramework}/Tests/Utils/Utils.cpp | 0 Code/Framework/{ => AzFramework}/Tests/Utils/Utils.h | 0 .../{ => AzFramework}/Tests/framework_shared_tests_files.cmake | 0 Code/Framework/{ => AzFramework}/Tests/frameworktests_files.cmake | 0 .../{ => AzFramework}/Tests/process_launch_test_files.cmake | 0 .../{ => AzToolsFramework}/Tests/ComponentAdapterTests.cpp | 0 .../Framework/{ => AzToolsFramework}/Tests/ComponentAddRemove.cpp | 0 .../EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp | 0 .../EntityOwnershipService/EntityOwnershipServiceTestFixture.h | 0 .../EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp | 0 .../Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp | 0 Code/Framework/{ => AzToolsFramework}/Tests/EntityTestbed.h | 0 Code/Framework/{ => AzToolsFramework}/Tests/FileFunc.cpp | 0 .../{ => AzToolsFramework}/Tests/GenericComponentWrapperTest.cpp | 0 .../{ => AzToolsFramework}/Tests/InstanceDataHierarchy.cpp | 0 .../{ => AzToolsFramework}/Tests/SQLiteConnectionTests.cpp | 0 .../{ => AzToolsFramework}/Tests/Script/ScriptComponentTests.cpp | 0 .../{ => AzToolsFramework}/Tests/Script/ScriptEntityTests.cpp | 0 Code/Framework/{ => AzToolsFramework}/Tests/Slices.cpp | 0 .../Framework/{ => AzToolsFramework}/Tests/TransformComponent.cpp | 0 62 files changed, 0 insertions(+), 0 deletions(-) rename Code/Framework/{ => AzFramework}/Tests/Application.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ArchiveCompressionTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ArchiveTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/AssetCatalog.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/AssetProcessorConnection.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/BehaviorEntityTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/BinToTextEncode.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/CMakeLists.txt (100%) rename Code/Framework/{ => AzFramework}/Tests/CameraInputTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/CameraState.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ClickDetectorTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/CursorStateTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/EntityContext.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/FileIO.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/FileTagTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/FrameworkApplicationFixture.h (100%) rename Code/Framework/{ => AzFramework}/Tests/GenAppDescriptors.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/InputTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Mocks/MockSpawnableEntitiesInterface.h (100%) rename Code/Framework/{ => AzFramework}/Tests/NativeWindow.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/OctreePerformanceTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/OctreeTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Android/platform_android_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Linux/platform_linux_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Mac/platform_mac_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/Windows/platform_windows_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h (100%) rename Code/Framework/{ => AzFramework}/Tests/Platform/iOS/platform_ios_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/PlatformHelper.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ProcessLaunchMain.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/ProcessLaunchParseTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Scene.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Utils/Utils.cpp (100%) rename Code/Framework/{ => AzFramework}/Tests/Utils/Utils.h (100%) rename Code/Framework/{ => AzFramework}/Tests/framework_shared_tests_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/frameworktests_files.cmake (100%) rename Code/Framework/{ => AzFramework}/Tests/process_launch_test_files.cmake (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/ComponentAdapterTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/ComponentAddRemove.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/EntityTestbed.h (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/FileFunc.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/GenericComponentWrapperTest.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/InstanceDataHierarchy.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/SQLiteConnectionTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/Script/ScriptComponentTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/Script/ScriptEntityTests.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/Slices.cpp (100%) rename Code/Framework/{ => AzToolsFramework}/Tests/TransformComponent.cpp (100%) diff --git a/Code/Framework/Tests/Application.cpp b/Code/Framework/AzFramework/Tests/Application.cpp similarity index 100% rename from Code/Framework/Tests/Application.cpp rename to Code/Framework/AzFramework/Tests/Application.cpp diff --git a/Code/Framework/Tests/ArchiveCompressionTests.cpp b/Code/Framework/AzFramework/Tests/ArchiveCompressionTests.cpp similarity index 100% rename from Code/Framework/Tests/ArchiveCompressionTests.cpp rename to Code/Framework/AzFramework/Tests/ArchiveCompressionTests.cpp diff --git a/Code/Framework/Tests/ArchiveTests.cpp b/Code/Framework/AzFramework/Tests/ArchiveTests.cpp similarity index 100% rename from Code/Framework/Tests/ArchiveTests.cpp rename to Code/Framework/AzFramework/Tests/ArchiveTests.cpp diff --git a/Code/Framework/Tests/AssetCatalog.cpp b/Code/Framework/AzFramework/Tests/AssetCatalog.cpp similarity index 100% rename from Code/Framework/Tests/AssetCatalog.cpp rename to Code/Framework/AzFramework/Tests/AssetCatalog.cpp diff --git a/Code/Framework/Tests/AssetProcessorConnection.cpp b/Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp similarity index 100% rename from Code/Framework/Tests/AssetProcessorConnection.cpp rename to Code/Framework/AzFramework/Tests/AssetProcessorConnection.cpp diff --git a/Code/Framework/Tests/BehaviorEntityTests.cpp b/Code/Framework/AzFramework/Tests/BehaviorEntityTests.cpp similarity index 100% rename from Code/Framework/Tests/BehaviorEntityTests.cpp rename to Code/Framework/AzFramework/Tests/BehaviorEntityTests.cpp diff --git a/Code/Framework/Tests/BinToTextEncode.cpp b/Code/Framework/AzFramework/Tests/BinToTextEncode.cpp similarity index 100% rename from Code/Framework/Tests/BinToTextEncode.cpp rename to Code/Framework/AzFramework/Tests/BinToTextEncode.cpp diff --git a/Code/Framework/Tests/CMakeLists.txt b/Code/Framework/AzFramework/Tests/CMakeLists.txt similarity index 100% rename from Code/Framework/Tests/CMakeLists.txt rename to Code/Framework/AzFramework/Tests/CMakeLists.txt diff --git a/Code/Framework/Tests/CameraInputTests.cpp b/Code/Framework/AzFramework/Tests/CameraInputTests.cpp similarity index 100% rename from Code/Framework/Tests/CameraInputTests.cpp rename to Code/Framework/AzFramework/Tests/CameraInputTests.cpp diff --git a/Code/Framework/Tests/CameraState.cpp b/Code/Framework/AzFramework/Tests/CameraState.cpp similarity index 100% rename from Code/Framework/Tests/CameraState.cpp rename to Code/Framework/AzFramework/Tests/CameraState.cpp diff --git a/Code/Framework/Tests/ClickDetectorTests.cpp b/Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp similarity index 100% rename from Code/Framework/Tests/ClickDetectorTests.cpp rename to Code/Framework/AzFramework/Tests/ClickDetectorTests.cpp diff --git a/Code/Framework/Tests/CursorStateTests.cpp b/Code/Framework/AzFramework/Tests/CursorStateTests.cpp similarity index 100% rename from Code/Framework/Tests/CursorStateTests.cpp rename to Code/Framework/AzFramework/Tests/CursorStateTests.cpp diff --git a/Code/Framework/Tests/EntityContext.cpp b/Code/Framework/AzFramework/Tests/EntityContext.cpp similarity index 100% rename from Code/Framework/Tests/EntityContext.cpp rename to Code/Framework/AzFramework/Tests/EntityContext.cpp diff --git a/Code/Framework/Tests/FileIO.cpp b/Code/Framework/AzFramework/Tests/FileIO.cpp similarity index 100% rename from Code/Framework/Tests/FileIO.cpp rename to Code/Framework/AzFramework/Tests/FileIO.cpp diff --git a/Code/Framework/Tests/FileTagTests.cpp b/Code/Framework/AzFramework/Tests/FileTagTests.cpp similarity index 100% rename from Code/Framework/Tests/FileTagTests.cpp rename to Code/Framework/AzFramework/Tests/FileTagTests.cpp diff --git a/Code/Framework/Tests/FrameworkApplicationFixture.h b/Code/Framework/AzFramework/Tests/FrameworkApplicationFixture.h similarity index 100% rename from Code/Framework/Tests/FrameworkApplicationFixture.h rename to Code/Framework/AzFramework/Tests/FrameworkApplicationFixture.h diff --git a/Code/Framework/Tests/GenAppDescriptors.cpp b/Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp similarity index 100% rename from Code/Framework/Tests/GenAppDescriptors.cpp rename to Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp diff --git a/Code/Framework/Tests/InputTests.cpp b/Code/Framework/AzFramework/Tests/InputTests.cpp similarity index 100% rename from Code/Framework/Tests/InputTests.cpp rename to Code/Framework/AzFramework/Tests/InputTests.cpp diff --git a/Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h b/Code/Framework/AzFramework/Tests/Mocks/MockSpawnableEntitiesInterface.h similarity index 100% rename from Code/Framework/Tests/Mocks/MockSpawnableEntitiesInterface.h rename to Code/Framework/AzFramework/Tests/Mocks/MockSpawnableEntitiesInterface.h diff --git a/Code/Framework/Tests/NativeWindow.cpp b/Code/Framework/AzFramework/Tests/NativeWindow.cpp similarity index 100% rename from Code/Framework/Tests/NativeWindow.cpp rename to Code/Framework/AzFramework/Tests/NativeWindow.cpp diff --git a/Code/Framework/Tests/OctreePerformanceTests.cpp b/Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp similarity index 100% rename from Code/Framework/Tests/OctreePerformanceTests.cpp rename to Code/Framework/AzFramework/Tests/OctreePerformanceTests.cpp diff --git a/Code/Framework/Tests/OctreeTests.cpp b/Code/Framework/AzFramework/Tests/OctreeTests.cpp similarity index 100% rename from Code/Framework/Tests/OctreeTests.cpp rename to Code/Framework/AzFramework/Tests/OctreeTests.cpp diff --git a/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h b/Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h similarity index 100% rename from Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h rename to Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Android.h diff --git a/Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Android/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Android/platform_android_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Android/platform_android_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Android/platform_android_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Android/platform_android_files.cmake diff --git a/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h b/Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h similarity index 100% rename from Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h rename to Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Linux.h diff --git a/Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Linux/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Linux/platform_linux_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Linux/platform_linux_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Linux/platform_linux_files.cmake diff --git a/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h b/Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h similarity index 100% rename from Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h rename to Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Mac.h diff --git a/Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Mac/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Mac/platform_mac_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Mac/platform_mac_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Mac/platform_mac_files.cmake diff --git a/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h b/Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h similarity index 100% rename from Code/Framework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h rename to Code/Framework/AzFramework/Tests/Platform/Windows/AzFrameworkTests_Traits_Windows.h diff --git a/Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake b/Code/Framework/AzFramework/Tests/Platform/Windows/platform_windows_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/Windows/platform_windows_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/Windows/platform_windows_files.cmake diff --git a/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h b/Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h similarity index 100% rename from Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h rename to Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_Platform.h diff --git a/Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h b/Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h similarity index 100% rename from Code/Framework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h rename to Code/Framework/AzFramework/Tests/Platform/iOS/AzFrameworkTests_Traits_iOS.h diff --git a/Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake b/Code/Framework/AzFramework/Tests/Platform/iOS/platform_ios_files.cmake similarity index 100% rename from Code/Framework/Tests/Platform/iOS/platform_ios_files.cmake rename to Code/Framework/AzFramework/Tests/Platform/iOS/platform_ios_files.cmake diff --git a/Code/Framework/Tests/PlatformHelper.cpp b/Code/Framework/AzFramework/Tests/PlatformHelper.cpp similarity index 100% rename from Code/Framework/Tests/PlatformHelper.cpp rename to Code/Framework/AzFramework/Tests/PlatformHelper.cpp diff --git a/Code/Framework/Tests/ProcessLaunchMain.cpp b/Code/Framework/AzFramework/Tests/ProcessLaunchMain.cpp similarity index 100% rename from Code/Framework/Tests/ProcessLaunchMain.cpp rename to Code/Framework/AzFramework/Tests/ProcessLaunchMain.cpp diff --git a/Code/Framework/Tests/ProcessLaunchParseTests.cpp b/Code/Framework/AzFramework/Tests/ProcessLaunchParseTests.cpp similarity index 100% rename from Code/Framework/Tests/ProcessLaunchParseTests.cpp rename to Code/Framework/AzFramework/Tests/ProcessLaunchParseTests.cpp diff --git a/Code/Framework/Tests/Scene.cpp b/Code/Framework/AzFramework/Tests/Scene.cpp similarity index 100% rename from Code/Framework/Tests/Scene.cpp rename to Code/Framework/AzFramework/Tests/Scene.cpp diff --git a/Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp b/Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp similarity index 100% rename from Code/Framework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp rename to Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp diff --git a/Code/Framework/Tests/Utils/Utils.cpp b/Code/Framework/AzFramework/Tests/Utils/Utils.cpp similarity index 100% rename from Code/Framework/Tests/Utils/Utils.cpp rename to Code/Framework/AzFramework/Tests/Utils/Utils.cpp diff --git a/Code/Framework/Tests/Utils/Utils.h b/Code/Framework/AzFramework/Tests/Utils/Utils.h similarity index 100% rename from Code/Framework/Tests/Utils/Utils.h rename to Code/Framework/AzFramework/Tests/Utils/Utils.h diff --git a/Code/Framework/Tests/framework_shared_tests_files.cmake b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake similarity index 100% rename from Code/Framework/Tests/framework_shared_tests_files.cmake rename to Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake diff --git a/Code/Framework/Tests/frameworktests_files.cmake b/Code/Framework/AzFramework/Tests/frameworktests_files.cmake similarity index 100% rename from Code/Framework/Tests/frameworktests_files.cmake rename to Code/Framework/AzFramework/Tests/frameworktests_files.cmake diff --git a/Code/Framework/Tests/process_launch_test_files.cmake b/Code/Framework/AzFramework/Tests/process_launch_test_files.cmake similarity index 100% rename from Code/Framework/Tests/process_launch_test_files.cmake rename to Code/Framework/AzFramework/Tests/process_launch_test_files.cmake diff --git a/Code/Framework/Tests/ComponentAdapterTests.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentAdapterTests.cpp similarity index 100% rename from Code/Framework/Tests/ComponentAdapterTests.cpp rename to Code/Framework/AzToolsFramework/Tests/ComponentAdapterTests.cpp diff --git a/Code/Framework/Tests/ComponentAddRemove.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp similarity index 100% rename from Code/Framework/Tests/ComponentAddRemove.cpp rename to Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp diff --git a/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp diff --git a/Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/EntityOwnershipServiceTestFixture.h diff --git a/Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp diff --git a/Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp similarity index 100% rename from Code/Framework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp rename to Code/Framework/AzToolsFramework/Tests/EntityOwnershipService/SliceEntityOwnershipTests.cpp diff --git a/Code/Framework/Tests/EntityTestbed.h b/Code/Framework/AzToolsFramework/Tests/EntityTestbed.h similarity index 100% rename from Code/Framework/Tests/EntityTestbed.h rename to Code/Framework/AzToolsFramework/Tests/EntityTestbed.h diff --git a/Code/Framework/Tests/FileFunc.cpp b/Code/Framework/AzToolsFramework/Tests/FileFunc.cpp similarity index 100% rename from Code/Framework/Tests/FileFunc.cpp rename to Code/Framework/AzToolsFramework/Tests/FileFunc.cpp diff --git a/Code/Framework/Tests/GenericComponentWrapperTest.cpp b/Code/Framework/AzToolsFramework/Tests/GenericComponentWrapperTest.cpp similarity index 100% rename from Code/Framework/Tests/GenericComponentWrapperTest.cpp rename to Code/Framework/AzToolsFramework/Tests/GenericComponentWrapperTest.cpp diff --git a/Code/Framework/Tests/InstanceDataHierarchy.cpp b/Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp similarity index 100% rename from Code/Framework/Tests/InstanceDataHierarchy.cpp rename to Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp diff --git a/Code/Framework/Tests/SQLiteConnectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/SQLiteConnectionTests.cpp similarity index 100% rename from Code/Framework/Tests/SQLiteConnectionTests.cpp rename to Code/Framework/AzToolsFramework/Tests/SQLiteConnectionTests.cpp diff --git a/Code/Framework/Tests/Script/ScriptComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/Script/ScriptComponentTests.cpp similarity index 100% rename from Code/Framework/Tests/Script/ScriptComponentTests.cpp rename to Code/Framework/AzToolsFramework/Tests/Script/ScriptComponentTests.cpp diff --git a/Code/Framework/Tests/Script/ScriptEntityTests.cpp b/Code/Framework/AzToolsFramework/Tests/Script/ScriptEntityTests.cpp similarity index 100% rename from Code/Framework/Tests/Script/ScriptEntityTests.cpp rename to Code/Framework/AzToolsFramework/Tests/Script/ScriptEntityTests.cpp diff --git a/Code/Framework/Tests/Slices.cpp b/Code/Framework/AzToolsFramework/Tests/Slices.cpp similarity index 100% rename from Code/Framework/Tests/Slices.cpp rename to Code/Framework/AzToolsFramework/Tests/Slices.cpp diff --git a/Code/Framework/Tests/TransformComponent.cpp b/Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp similarity index 100% rename from Code/Framework/Tests/TransformComponent.cpp rename to Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp From c13720e255163d4ea994ab41003be17eaddfec1b Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Fri, 9 Jul 2021 08:09:00 -0700 Subject: [PATCH 031/300] fixes and cmake changes to get it to compile Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Framework/AzFramework/CMakeLists.txt | 60 +++++++++++++++++ .../AzFramework/Tests/CMakeLists.txt | 64 ------------------- .../AzFramework/Tests/GenAppDescriptors.cpp | 8 +-- Code/Framework/AzFramework/Tests/Scene.cpp | 1 - .../Tests/framework_shared_tests_files.cmake | 1 + .../Tests/frameworktests_files.cmake | 18 +----- .../Framework/AzToolsFramework/CMakeLists.txt | 1 + .../AzToolsFramework/Tests/FileFunc.cpp | 4 +- .../AzToolsFramework/Tests/Slices.cpp | 38 +++++------ .../Tests/aztoolsframeworktests_files.cmake | 15 +++++ Code/Framework/CMakeLists.txt | 1 - 11 files changed, 103 insertions(+), 108 deletions(-) delete mode 100644 Code/Framework/AzFramework/Tests/CMakeLists.txt diff --git a/Code/Framework/AzFramework/CMakeLists.txt b/Code/Framework/AzFramework/CMakeLists.txt index 1f53472ff8..2cfc5e4b89 100644 --- a/Code/Framework/AzFramework/CMakeLists.txt +++ b/Code/Framework/AzFramework/CMakeLists.txt @@ -52,3 +52,63 @@ ly_add_source_properties( PROPERTY COMPILE_DEFINITIONS VALUES TOUCHBENDING_LAYER_BIT=${LY_TOUCHBENDING_LAYER_BIT} ) + +if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) + + ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Tests/Platform/${PAL_PLATFORM_NAME}) + + ly_add_target( + NAME AzFrameworkTestShared STATIC + NAMESPACE AZ + FILES_CMAKE + Tests/framework_shared_tests_files.cmake + INCLUDE_DIRECTORIES + PUBLIC + Tests + BUILD_DEPENDENCIES + PRIVATE + AZ::AzCore + AZ::AzFramework + ) + + if(PAL_TRAIT_BUILD_HOST_TOOLS) + + ly_add_target( + NAME ProcessLaunchTest EXECUTABLE + NAMESPACE AZ + FILES_CMAKE + Tests/process_launch_test_files.cmake + INCLUDE_DIRECTORIES + PRIVATE + Tests + BUILD_DEPENDENCIES + PRIVATE + AZ::AzCore + AZ::AzFramework + ) + + ly_add_target( + NAME AzFramework.Tests ${PAL_TRAIT_TEST_TARGET_TYPE} + NAMESPACE AZ + FILES_CMAKE + Tests/frameworktests_files.cmake + INCLUDE_DIRECTORIES + PRIVATE + Tests + ${pal_dir} + BUILD_DEPENDENCIES + PRIVATE + AZ::AzFramework + AZ::AzTest + AZ::AzTestShared + AZ::AzFrameworkTestShared + RUNTIME_DEPENDENCIES + AZ::ProcessLaunchTest + ) + ly_add_googletest( + NAME AZ::AzFramework.Tests + ) + + endif() + +endif() \ No newline at end of file diff --git a/Code/Framework/AzFramework/Tests/CMakeLists.txt b/Code/Framework/AzFramework/Tests/CMakeLists.txt deleted file mode 100644 index 6781466413..0000000000 --- a/Code/Framework/AzFramework/Tests/CMakeLists.txt +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) - - ly_get_list_relative_pal_filename(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME}) - - ly_add_target( - NAME AzFrameworkTestShared STATIC - NAMESPACE AZ - FILES_CMAKE - framework_shared_tests_files.cmake - INCLUDE_DIRECTORIES - PUBLIC - . - BUILD_DEPENDENCIES - PRIVATE - AZ::AzCore - AZ::AzFramework - ) - - if(PAL_TRAIT_BUILD_HOST_TOOLS) - ly_add_target( - NAME ProcessLaunchTest EXECUTABLE - NAMESPACE AZ - FILES_CMAKE - process_launch_test_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - BUILD_DEPENDENCIES - PRIVATE - AZ::AzCore - AZ::AzFramework - ) - - ly_add_target( - NAME Framework.Tests ${PAL_TRAIT_TEST_TARGET_TYPE} - NAMESPACE AZ - FILES_CMAKE - frameworktests_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - ${pal_dir} - BUILD_DEPENDENCIES - PRIVATE - AZ::AzTest - AZ::AzToolsFramework - AZ::AzTestShared - AZ::AzFrameworkTestShared - RUNTIME_DEPENDENCIES - AZ::ProcessLaunchTest - ) - ly_add_googletest( - NAME AZ::Framework.Tests - ) - endif() - -endif() diff --git a/Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp b/Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp index dde3800895..069d3b35f2 100644 --- a/Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp +++ b/Code/Framework/AzFramework/Tests/GenAppDescriptors.cpp @@ -15,16 +15,16 @@ namespace UnitTest { using namespace AZ; - class SetRestoreFileIOBaseRAII + class FileIOBaseRAII { public: - SetRestoreFileIOBaseRAII(AZ::IO::FileIOBase& fileIO) + FileIOBaseRAII(AZ::IO::FileIOBase& fileIO) : m_prevFileIO(AZ::IO::FileIOBase::GetInstance()) { AZ::IO::FileIOBase::SetInstance(&fileIO); } - ~SetRestoreFileIOBaseRAII() + ~FileIOBaseRAII() { AZ::IO::FileIOBase::SetInstance(m_prevFileIO); } @@ -102,7 +102,7 @@ namespace UnitTest TEST_F(GenAppDescriptors, Test) { AZ::IO::LocalFileIO fileIO; - SetRestoreFileIOBaseRAII restoreFileIOScope(fileIO); + FileIOBaseRAII restoreFileIOScope(fileIO); run(); } } diff --git a/Code/Framework/AzFramework/Tests/Scene.cpp b/Code/Framework/AzFramework/Tests/Scene.cpp index 32a0958692..57293c9d77 100644 --- a/Code/Framework/AzFramework/Tests/Scene.cpp +++ b/Code/Framework/AzFramework/Tests/Scene.cpp @@ -9,7 +9,6 @@ AZ_PUSH_DISABLE_WARNING(, "-Wdelete-non-virtual-dtor") -#include #include #include #include diff --git a/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake index 72ffdf0043..5ee7ff644b 100644 --- a/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake +++ b/Code/Framework/AzFramework/Tests/framework_shared_tests_files.cmake @@ -9,4 +9,5 @@ set(FILES Mocks/MockSpawnableEntitiesInterface.h Utils/Utils.h Utils/Utils.cpp + FrameworkApplicationFixture.h ) diff --git a/Code/Framework/AzFramework/Tests/frameworktests_files.cmake b/Code/Framework/AzFramework/Tests/frameworktests_files.cmake index 398bb8f45b..25c56f5a71 100644 --- a/Code/Framework/AzFramework/Tests/frameworktests_files.cmake +++ b/Code/Framework/AzFramework/Tests/frameworktests_files.cmake @@ -6,44 +6,28 @@ # set(FILES - ../AzCore/Tests/Main.cpp + ../../AzCore/Tests/Main.cpp Spawnable/SpawnableEntitiesManagerTests.cpp ArchiveCompressionTests.cpp ArchiveTests.cpp BehaviorEntityTests.cpp BinToTextEncode.cpp - ComponentAddRemove.cpp - ComponentAdapterTests.cpp CameraInputTests.cpp ClickDetectorTests.cpp CursorStateTests.cpp EntityContext.cpp - EntityTestbed.h - FileFunc.cpp FileIO.cpp FileTagTests.cpp - FrameworkApplicationFixture.h GenAppDescriptors.cpp - GenericComponentWrapperTest.cpp - InstanceDataHierarchy.cpp OctreePerformanceTests.cpp OctreeTests.cpp - Slices.cpp - Script/ScriptComponentTests.cpp - Script/ScriptEntityTests.cpp AssetCatalog.cpp AssetProcessorConnection.cpp NativeWindow.cpp - TransformComponent.cpp - SQLiteConnectionTests.cpp ProcessLaunchParseTests.cpp Application.cpp PlatformHelper.cpp Scene.cpp - EntityOwnershipService/EntityOwnershipServiceTestFixture.h - EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp - EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp - EntityOwnershipService/SliceEntityOwnershipTests.cpp CameraState.cpp InputTests.cpp ) diff --git a/Code/Framework/AzToolsFramework/CMakeLists.txt b/Code/Framework/AzToolsFramework/CMakeLists.txt index b2a9690948..9a54ee5226 100644 --- a/Code/Framework/AzToolsFramework/CMakeLists.txt +++ b/Code/Framework/AzToolsFramework/CMakeLists.txt @@ -76,6 +76,7 @@ if(PAL_TRAIT_BUILD_TESTS_SUPPORTED) PRIVATE AZ::AzTestShared 3rdParty::Qt::Test + AZ::AzFrameworkTestShared AZ::AzToolsFramework AZ::AzToolsFrameworkTestCommon AZ::AzManipulatorTestFramework.Static diff --git a/Code/Framework/AzToolsFramework/Tests/FileFunc.cpp b/Code/Framework/AzToolsFramework/Tests/FileFunc.cpp index 4edb91164c..420caa0f55 100644 --- a/Code/Framework/AzToolsFramework/Tests/FileFunc.cpp +++ b/Code/Framework/AzToolsFramework/Tests/FileFunc.cpp @@ -5,8 +5,8 @@ * */ -#include "FrameworkApplicationFixture.h" -#include "Utils/Utils.h" +#include +#include #include #include #include diff --git a/Code/Framework/AzToolsFramework/Tests/Slices.cpp b/Code/Framework/AzToolsFramework/Tests/Slices.cpp index ba413eb727..a8c98d2a85 100644 --- a/Code/Framework/AzToolsFramework/Tests/Slices.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Slices.cpp @@ -972,11 +972,11 @@ namespace UnitTest }; - class TestExportEditorComponent + class SliceTestExportEditorComponent : public AzToolsFramework::Components::EditorComponentBase { public: - AZ_COMPONENT(TestExportEditorComponent, "{8FA877A2-38E6-49AD-B31E-71B86DC8BB03}", AzToolsFramework::Components::EditorComponentBase); + AZ_COMPONENT(SliceTestExportEditorComponent, "{8FA877A2-38E6-49AD-B31E-71B86DC8BB03}", AzToolsFramework::Components::EditorComponentBase); enum ExportComponentType { @@ -986,9 +986,9 @@ namespace UnitTest EXPORT_NULL_COMPONENT }; - TestExportEditorComponent() {} + SliceTestExportEditorComponent() {} - TestExportEditorComponent(ExportComponentType exportType, bool exportHandled) : + SliceTestExportEditorComponent(ExportComponentType exportType, bool exportHandled) : m_exportType(exportType), m_exportHandled(exportHandled) {} @@ -1000,15 +1000,15 @@ namespace UnitTest { if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) { - serializeContext->Class() + serializeContext->Class() ; if (AZ::EditContext* editContext = serializeContext->GetEditContext()) { - editContext->Class( + editContext->Class( "Test Export Editor Component", "Validate different options for exporting editor components") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::RuntimeExportCallback, &TestExportEditorComponent::ExportComponent) + ->Attribute(AZ::Edit::Attributes::RuntimeExportCallback, &SliceTestExportEditorComponent::ExportComponent) ; } } @@ -1070,7 +1070,7 @@ namespace UnitTest m_app.RegisterComponentDescriptor(TestExportRuntimeComponent::CreateDescriptor()); m_app.RegisterComponentDescriptor(TestExportOtherRuntimeComponent::CreateDescriptor()); - m_app.RegisterComponentDescriptor(TestExportEditorComponent::CreateDescriptor()); + m_app.RegisterComponentDescriptor(SliceTestExportEditorComponent::CreateDescriptor()); m_editorSliceAsset = Data::AssetManager::Instance().CreateAsset(Data::AssetId(Uuid::CreateRandom())); @@ -1125,11 +1125,11 @@ namespace UnitTest } // create entity containing the EditorOnly component in the editor slice - void CreateTestExportEditorEntity(const char* name, TestExportEditorComponent::ExportComponentType exportType, bool exportHandled) + void CreateTestExportEditorEntity(const char* name, SliceTestExportEditorComponent::ExportComponentType exportType, bool exportHandled) { AZ::Entity* entity = aznew AZ::Entity(name); entity->CreateComponent(); - entity->CreateComponent(exportType, exportHandled); + entity->CreateComponent(exportType, exportHandled); m_editorSliceComponent->AddEntity(entity); } @@ -1314,7 +1314,7 @@ namespace UnitTest TEST_F(SliceCompilerTest, RuntimeExportCallback_EditorComponentExportedSuccessfully) { // Create an editor component that has a RuntimeExportCallback and successfully exports itself - CreateTestExportEditorEntity("EntityWithEditorComponent", TestExportEditorComponent::ExportComponentType::EXPORT_OTHER_RUNTIME_COMPONENT, true); + CreateTestExportEditorEntity("EntityWithEditorComponent", SliceTestExportEditorComponent::ExportComponentType::EXPORT_OTHER_RUNTIME_COMPONENT, true); if (!CompileSlice()) { @@ -1325,7 +1325,7 @@ namespace UnitTest // (A result of Runtime component means BuildGameEntity() ran instead) AZ::Entity* entity = GetCompiledEntity("EntityWithEditorComponent"); EXPECT_TRUE(entity); - EXPECT_FALSE(entity->FindComponent()); + EXPECT_FALSE(entity->FindComponent()); EXPECT_FALSE(entity->FindComponent()); EXPECT_TRUE(entity->FindComponent()); } @@ -1333,7 +1333,7 @@ namespace UnitTest TEST_F(SliceCompilerTest, RuntimeExportCallback_EditorComponentExportSuppressed) { // Create an editor component that has a RuntimeExportCallback and successfully suppresses itself from exporting - CreateTestExportEditorEntity("EntityWithEditorComponent", TestExportEditorComponent::ExportComponentType::EXPORT_NULL_COMPONENT, true); + CreateTestExportEditorEntity("EntityWithEditorComponent", SliceTestExportEditorComponent::ExportComponentType::EXPORT_NULL_COMPONENT, true); if (!CompileSlice()) { @@ -1343,7 +1343,7 @@ namespace UnitTest // Expected result: exported slice does NOT contain either component. AZ::Entity* entity = GetCompiledEntity("EntityWithEditorComponent"); EXPECT_TRUE(entity); - EXPECT_FALSE(entity->FindComponent()); + EXPECT_FALSE(entity->FindComponent()); EXPECT_FALSE(entity->FindComponent()); EXPECT_FALSE(entity->FindComponent()); } @@ -1351,7 +1351,7 @@ namespace UnitTest TEST_F(SliceCompilerTest, RuntimeExportCallback_EditorComponentExportUnhandledFallbackToBuildGameEntity) { // Create an editor component that has a RuntimeExportCallback, returns a pointer to itself, but says it wasn't handled. - CreateTestExportEditorEntity("EntityWithEditorComponent", TestExportEditorComponent::ExportComponentType::EXPORT_EDITOR_COMPONENT, false); + CreateTestExportEditorEntity("EntityWithEditorComponent", SliceTestExportEditorComponent::ExportComponentType::EXPORT_EDITOR_COMPONENT, false); if (!CompileSlice()) { @@ -1362,7 +1362,7 @@ namespace UnitTest // produced a runtime component. AZ::Entity* entity = GetCompiledEntity("EntityWithEditorComponent"); EXPECT_TRUE(entity); - EXPECT_FALSE(entity->FindComponent()); + EXPECT_FALSE(entity->FindComponent()); EXPECT_TRUE(entity->FindComponent()); EXPECT_FALSE(entity->FindComponent()); } @@ -1370,7 +1370,7 @@ namespace UnitTest TEST_F(SliceCompilerTest, RuntimeExportCallback_EditorComponentExportSuppressedAndUnhandledFallbackToBuildGameEntity) { // Create an editor component that has a RuntimeExportCallback and suppresses itself from exporting, but says it wasn't handled - CreateTestExportEditorEntity("EntityWithEditorComponent", TestExportEditorComponent::ExportComponentType::EXPORT_NULL_COMPONENT, false); + CreateTestExportEditorEntity("EntityWithEditorComponent", SliceTestExportEditorComponent::ExportComponentType::EXPORT_NULL_COMPONENT, false); if (!CompileSlice()) { @@ -1381,7 +1381,7 @@ namespace UnitTest // produced a runtime component. AZ::Entity* entity = GetCompiledEntity("EntityWithEditorComponent"); EXPECT_TRUE(entity); - EXPECT_FALSE(entity->FindComponent()); + EXPECT_FALSE(entity->FindComponent()); EXPECT_TRUE(entity->FindComponent()); EXPECT_FALSE(entity->FindComponent()); } @@ -1389,7 +1389,7 @@ namespace UnitTest TEST_F(SliceCompilerTest, RuntimeExportCallback_EditorComponentFailsToExportItself) { // Create an editor component that has a RuntimeExportCallback and suppresses itself from exporting, but says it wasn't handled - CreateTestExportEditorEntity("EntityWithEditorComponent", TestExportEditorComponent::ExportComponentType::EXPORT_EDITOR_COMPONENT, true); + CreateTestExportEditorEntity("EntityWithEditorComponent", SliceTestExportEditorComponent::ExportComponentType::EXPORT_EDITOR_COMPONENT, true); // We expect the slice compilation to fail, since an editor component is being exported as a game component CompileSlice(false); diff --git a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake index 2e2be6f921..573de25d42 100644 --- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake +++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake @@ -100,4 +100,19 @@ set(FILES Viewport/ClusterTests.cpp Viewport/ViewportUiWidgetManagerTests.cpp Visibility/EditorVisibilityTests.cpp + ComponentAdapterTests.cpp + ComponentAddRemove.cpp + EntityTestbed.h + GenericComponentWrapperTest.cpp + InstanceDataHierarchy.cpp + Slices.cpp + SQLiteConnectionTests.cpp + TransformComponent.cpp + EntityOwnershipService/EntityOwnershipServiceTestFixture.h + EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp + EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp + EntityOwnershipService/SliceEntityOwnershipTests.cpp + Script/ScriptComponentTests.cpp + Script/ScriptEntityTests.cpp + FileFunc.cpp ) diff --git a/Code/Framework/CMakeLists.txt b/Code/Framework/CMakeLists.txt index e12a8f4cab..880751632c 100644 --- a/Code/Framework/CMakeLists.txt +++ b/Code/Framework/CMakeLists.txt @@ -18,4 +18,3 @@ add_subdirectory(AzNetworking) add_subdirectory(Crcfix) add_subdirectory(GFxFramework) add_subdirectory(GridMate) -add_subdirectory(Tests) From 1dec9d4a9a07f631f96f23f9ee37f2e3ab279799 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 18:03:10 -0700 Subject: [PATCH 032/300] Fix tests in AzToolsFramework now that the Trace bus is hooked Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Tests/AssetFileInfoListComparison.cpp | 2 ++ .../Tests/AssetSeedManager.cpp | 6 ++++ .../Tests/ComponentModeTests.cpp | 3 ++ .../Tests/EntityInspectorTests.cpp | 1 - .../Framework/AzToolsFramework/Tests/Main.cpp | 2 +- .../Tests/PerforceComponentTests.cpp | 6 +--- .../PlatformAddressedAssetCatalogTests.cpp | 2 ++ .../Tests/Prefab/PrefabInstantiateTests.cpp | 2 ++ .../Tests/Prefab/PrefabLoadTemplateTests.cpp | 22 +++++++++++++-- .../Tests/Prefab/PrefabTestDomUtils.cpp | 28 +++++++++++++++---- .../Tests/Prefab/PrefabTestFixture.h | 3 +- .../Tests/PropertyTreeEditorTests.cpp | 8 ++++++ .../Tests/SliceUpgradeTests.cpp | 5 ++++ .../Tests/ThumbnailerTests.cpp | 5 ---- .../EditorLayerComponentTests.cpp | 2 -- .../Tests/TransformComponent.cpp | 4 +-- .../Tests/UI/EntityPropertyEditorTests.cpp | 7 ----- .../Viewport/ViewportUiWidgetManagerTests.cpp | 15 ++-------- 18 files changed, 77 insertions(+), 46 deletions(-) diff --git a/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp b/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp index f950f43abc..2e4641d818 100644 --- a/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp +++ b/Code/Framework/AzToolsFramework/Tests/AssetFileInfoListComparison.cpp @@ -54,6 +54,7 @@ namespace UnitTest m_localFileIO = aznew AZ::IO::LocalFileIO(); m_priorFileIO = AZ::IO::FileIOBase::GetInstance(); + AZ::IO::FileIOBase::SetInstance(nullptr); AZ::IO::FileIOBase::SetInstance(m_localFileIO); AZ::IO::FileIOBase::GetInstance()->SetAlias("@assets@", GetTestFolderPath().c_str()); @@ -175,6 +176,7 @@ namespace UnitTest delete m_pcCatalog; delete m_localFileIO; m_localFileIO = nullptr; + AZ::IO::FileIOBase::SetInstance(nullptr); AZ::IO::FileIOBase::SetInstance(m_priorFileIO); m_application->Stop(); delete m_application; diff --git a/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp b/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp index 71e4184eb6..52b8cc6a52 100644 --- a/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp +++ b/Code/Framework/AzToolsFramework/Tests/AssetSeedManager.cpp @@ -266,7 +266,9 @@ namespace UnitTest AZ::IO::SystemFile::SetWritable(filePath.c_str(), false); // Attempt to save to the same file. Should not be allowed. + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_FALSE(m_assetSeedManager->Save(filePath)); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); // Clean up the test environment AZ::IO::SystemFile::SetWritable(filePath.c_str(), true); @@ -290,7 +292,9 @@ namespace UnitTest AZ::IO::SystemFile::SetWritable(filePath.c_str(), false); // Attempt to save to the same file. Should not be allowed. + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_FALSE(m_assetSeedManager->SaveAssetFileInfo(filePath, AzFramework::PlatformFlags::Platform_PC, {})); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); // Clean up the test environment AZ::IO::SystemFile::SetWritable(filePath.c_str(), true); @@ -357,7 +361,9 @@ namespace UnitTest m_assetSeedManager->AddSeedAsset(assets[2], AzFramework::PlatformFlags::Platform_PC); // Step we are testing + AZ_TEST_START_TRACE_SUPPRESSION; m_assetSeedManager->AddPlatformToAllSeeds(AzFramework::PlatformId::ANDROID_ID); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); // Verification AzFramework::PlatformFlags expectedPlatformFlags = AzFramework::PlatformFlags::Platform_PC | AzFramework::PlatformFlags::Platform_ANDROID; diff --git a/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp b/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp index 775c771a8a..9ee75408e6 100644 --- a/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/ComponentModeTests.cpp @@ -493,7 +493,10 @@ namespace UnitTest // Add placeholder component which implements component mode. entity->CreateComponent(); + AZ_TEST_START_TRACE_SUPPRESSION; entity->Activate(); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); + /////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp b/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp index 3bc4c092dc..c15034ee33 100644 --- a/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp @@ -348,7 +348,6 @@ namespace UnitTest EXPECT_FALSE(AzToolsFramework::ComponentPaletteUtil::ContainsEditableComponents(context, &Filter_IsTestComponent2, AZ::ComponentDescriptor::DependencyArrayType())); // Reflect Test Component 2 for subsequent tests - Inspector_TestComponent2::Reflect(context); m_application->RegisterComponentDescriptor(Inspector_TestComponent2Descriptor); // Verify that there is now a component that satisfies the AppearsInGameComponentMenu filter without service dependency conditions diff --git a/Code/Framework/AzToolsFramework/Tests/Main.cpp b/Code/Framework/AzToolsFramework/Tests/Main.cpp index ff94f9af5c..21aac978b3 100644 --- a/Code/Framework/AzToolsFramework/Tests/Main.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Main.cpp @@ -46,7 +46,7 @@ AZTEST_EXPORT int AZ_UNIT_TEST_HOOK_NAME(int argc, char** argv) } styleManager->initialize(&app, engineRootPath); AZ::Test::printUnusedParametersWarning(argc, argv); - AZ::Test::addTestEnvironments({ new ToolsFrameworkHook }); + AZ::Test::addTestEnvironments({ DEFAULT_UNIT_TEST_ENV, new ToolsFrameworkHook }); int result = RUN_ALL_TESTS(); styleManager.release(); return result; diff --git a/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp index db7430085b..46f9a9fa3a 100644 --- a/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/PerforceComponentTests.cpp @@ -23,8 +23,7 @@ namespace UnitTest }; struct PerforceComponentFixture - : ::testing::Test - , TraceBusRedirector + : ScopedAllocatorSetupFixture , SourceControlTest { @@ -40,7 +39,6 @@ namespace UnitTest m_jobContext = aznew AZ::JobContext(*m_jobManager); AZ::JobContext::SetGlobalContext(m_jobContext); - AZ::Debug::TraceMessageBus::Handler::BusConnect(); AZ::TickBus::AllowFunctionQueuing(true); m_perforceComponent = AZStd::make_unique(); @@ -52,8 +50,6 @@ namespace UnitTest void TearDown() override { - AZ::Debug::TraceMessageBus::Handler::BusDisconnect(); - AZ::TickBus::AllowFunctionQueuing(false); AZ::TickBus::ClearQueuedEvents(); diff --git a/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp index e581f4fac7..2ac66564df 100644 --- a/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/PlatformAddressedAssetCatalogTests.cpp @@ -246,7 +246,9 @@ namespace UnitTest AzFramework::AssetSystem::NetworkAssetUpdateInterface* notificationInterface = AZ::Interface::Get(); EXPECT_NE(notificationInterface, nullptr); + AZ_TEST_START_TRACE_SUPPRESSION; auto* mockCatalog = new ::testing::NiceMock(AzFramework::PlatformId::ANDROID_ID); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; AZStd::unique_ptr< ::testing::NiceMock> catalogHolder; catalogHolder.reset(mockCatalog); diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp index a08de99d3e..81d44d7426 100644 --- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstantiateTests.cpp @@ -13,7 +13,9 @@ namespace UnitTest TEST_F(PrefabInstantiateTest, PrefabInstantiate_InstantiateInvalidTemplate_InstantiateFails) { + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_FALSE(m_prefabSystemComponent->InstantiatePrefab(AzToolsFramework::Prefab::InvalidTemplateId)); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; } TEST_F(PrefabInstantiateTest, PrefabInstantiate_NoNestingTemplate_InstantiateSucceeds) diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp index 9cf1194834..db7640916d 100644 --- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabLoadTemplateTests.cpp @@ -68,8 +68,10 @@ namespace UnitTest MockPrefabFileIOActionValidator mockIOActionValidator; mockIOActionValidator.ReadPrefabDom(templateData.m_filePath, templatePrefabDom); - + + AZ_TEST_START_TRACE_SUPPRESSION; templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; templateData.m_isLoadedWithErrors = true; PrefabTestDataUtils::ValidateTemplateLoad(templateData); @@ -115,7 +117,9 @@ namespace UnitTest targetTemplateData.m_filePath, targetTemplatePrefabDom); // Load target and source Templates and get their Ids. + AZ_TEST_START_TRACE_SUPPRESSION; targetTemplateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(targetTemplateData.m_filePath); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; sourceTemplateData.m_id = m_prefabSystemComponent->GetTemplateIdFromFilePath(sourceTemplateData.m_filePath); // Because of cyclical dependency, the two Templates should be loaded with errors. @@ -144,7 +148,9 @@ namespace UnitTest MockPrefabFileIOActionValidator mockIOActionValidator; mockIOActionValidator.ReadPrefabDom(templateData.m_filePath, templatePrefabDom); + AZ_TEST_START_TRACE_SUPPRESSION; templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; PrefabTestDataUtils::ValidateTemplateLoad(templateData); } @@ -161,7 +167,9 @@ namespace UnitTest MockPrefabFileIOActionValidator mockIOActionValidator; mockIOActionValidator.ReadPrefabDom(templateData.m_filePath, templatePrefabDom); + AZ_TEST_START_TRACE_SUPPRESSION; templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; PrefabTestDataUtils::ValidateTemplateLoad(templateData); } @@ -183,7 +191,9 @@ namespace UnitTest templateInstanceData.m_source, PrefabTestDomUtils::CreatePrefabDom(), AZ::IO::ResultCode::Success, AZ::IO::ResultCode::Error); + AZ_TEST_START_TRACE_SUPPRESSION; templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromFile(templateData.m_filePath); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; PrefabTestDataUtils::ValidateTemplateLoad(templateData); } @@ -279,8 +289,10 @@ namespace UnitTest MockPrefabFileIOActionValidator mockIOActionValidator; mockIOActionValidator.ReadPrefabDom(pathToCorruptedPrefab, corruptedPrefabContent); - + + AZ_TEST_START_TRACE_SUPPRESSION; TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromFile(pathToCorruptedPrefab); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId); } @@ -289,8 +301,10 @@ namespace UnitTest { PrefabDom emptyPrefabDom = PrefabTestDomUtils::CreatePrefabDom(); AZStd::string emptyPrefabDomStr = PrefabTestDomUtils::DomToString(emptyPrefabDom); + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_EQ(m_prefabLoaderInterface->LoadTemplateFromString(emptyPrefabDomStr, "|?<>"), AzToolsFramework::Prefab::InvalidTemplateId); EXPECT_EQ(m_prefabLoaderInterface->LoadTemplateFromString(emptyPrefabDomStr, "notAFile/"), AzToolsFramework::Prefab::InvalidTemplateId); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; } TEST_F(PrefabLoadTemplateTest, LoadTemplate_LoadFromString_LoadsEmptyPrefab) @@ -318,9 +332,11 @@ namespace UnitTest ); AZStd::string selfDependentPrefabStr = PrefabTestDomUtils::DomToString(selfDependentPrefab); + AZ_TEST_START_TRACE_SUPPRESSION; templateData.m_id = m_prefabLoaderInterface->LoadTemplateFromString( selfDependentPrefabStr, templateData.m_filePath); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; templateData.m_isLoadedWithErrors = true; @@ -330,7 +346,9 @@ namespace UnitTest TEST_F(PrefabLoadTemplateTest, LoadTemplate_LoadFromString_CorruptedReturnsInvalidTemplateId) { AZStd::string corruptPrefab = "{ Corrupted PrefabDom"; + AZ_TEST_START_TRACE_SUPPRESSION; TemplateId templateId = m_prefabLoaderInterface->LoadTemplateFromString(corruptPrefab); + AZ_TEST_STOP_TRACE_SUPPRESSION_NO_COUNT; EXPECT_EQ(templateId, AzToolsFramework::Prefab::InvalidTemplateId); } } diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp index 34cff98a73..413e3ea0b4 100644 --- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.cpp @@ -166,13 +166,29 @@ namespace UnitTest if (expectedNestedInstanceDomInstances.has_value()) { ASSERT_TRUE(actualNestedInstanceDomInstances.has_value()); - for (auto instanceIterator = expectedNestedInstanceDomInstances->get().MemberBegin(); - instanceIterator != expectedNestedInstanceDomInstances->get().MemberEnd(); ++instanceIterator) + if (expectedNestedInstanceDomInstances->get().IsArray()) { - ComparePrefabDoms( - instanceIterator->value, - PrefabDomUtils::FindPrefabDomValue(actualNestedInstanceDomInstances->get(), instanceIterator->name.GetString()), - shouldCompareLinkIds, shouldCompareContainerEntities); + ASSERT_TRUE(actualNestedInstanceDomInstances->get().IsArray()); + const size_t arraySize = expectedNestedInstanceDomInstances->get().GetArray().Size(); + for(size_t i = 0; i < arraySize; ++i) + { + ComparePrefabDoms( + expectedNestedInstanceDomInstances->get().GetArray()[i], + actualNestedInstanceDomInstances->get().GetArray()[i], + shouldCompareLinkIds, shouldCompareContainerEntities); + } + } + if (expectedNestedInstanceDomInstances->get().IsObject()) + { + ASSERT_TRUE(actualNestedInstanceDomInstances->get().IsObject()); + for (auto instanceIterator = expectedNestedInstanceDomInstances->get().MemberBegin(); + instanceIterator != expectedNestedInstanceDomInstances->get().MemberEnd(); ++instanceIterator) + { + ComparePrefabDoms( + instanceIterator->value, + PrefabDomUtils::FindPrefabDomValue(actualNestedInstanceDomInstances->get(), instanceIterator->name.GetString()), + shouldCompareLinkIds, shouldCompareContainerEntities); + } } } } diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h index 763d3bec1f..b438f9f28d 100644 --- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h +++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestFixture.h @@ -37,8 +37,7 @@ namespace UnitTest }; class PrefabTestFixture - : public ToolsApplicationFixture, - public UnitTest::TraceBusRedirector + : public ToolsApplicationFixture { protected: diff --git a/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp b/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp index 99cf334dc9..006dd5a656 100644 --- a/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/PropertyTreeEditorTests.cpp @@ -426,7 +426,9 @@ namespace UnitTest AZStd::any keyString = AZStd::make_any("0"); EXPECT_FALSE(propertyTree.GetContainerItem("My New Int", key).IsSuccess()); + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_FALSE(propertyTree.GetContainerItem("My New List", keyString).IsSuccess()); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); PropertyTreeEditor::PropertyAccessOutcome outcome = propertyTree.GetContainerItem("My New List", key); EXPECT_TRUE(outcome.IsSuccess()); @@ -446,7 +448,9 @@ namespace UnitTest AZStd::any value = AZStd::make_any(testUpdate); EXPECT_FALSE(propertyTree.UpdateContainerItem("My New Int", key, value).IsSuccess()); + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_FALSE(propertyTree.UpdateContainerItem("My New List", keyString, value).IsSuccess()); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); EXPECT_TRUE(propertyTree.UpdateContainerItem("My New List", key, value).IsSuccess()); PropertyTreeEditor::PropertyAccessOutcome outcome = propertyTree.GetContainerItem("My New List", key); @@ -464,7 +468,9 @@ namespace UnitTest AZStd::any keyString = AZStd::make_any("0"); EXPECT_FALSE(propertyTree.RemoveContainerItem("My New Int", key).IsSuccess()); + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_FALSE(propertyTree.RemoveContainerItem("My New List", keyString).IsSuccess()); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); PropertyTreeEditor::PropertyAccessOutcome outcomeAdd1 = propertyTree.RemoveContainerItem("My New List", key); EXPECT_TRUE(outcomeAdd1.IsSuccess()); @@ -755,7 +761,9 @@ namespace UnitTest EXPECT_TRUE(propertyTree.SetProperty("My Int", anEmpty).IsSuccess()); EXPECT_TRUE(propertyTree.SetProperty("My Negative Short", anEmpty).IsSuccess()); EXPECT_TRUE(propertyTree.SetProperty("My New List", anEmpty).IsSuccess()); + AZ_TEST_START_TRACE_SUPPRESSION; EXPECT_TRUE(propertyTree.SetProperty("My Asset Data", anEmpty).IsSuccess()); + AZ_TEST_STOP_TRACE_SUPPRESSION(1); EXPECT_TRUE(propertyTree.SetProperty("My Test Simple Asset", anEmpty).IsSuccess()); } diff --git a/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp b/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp index 98b004feba..f8acf7d224 100644 --- a/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/SliceUpgradeTests.cpp @@ -275,6 +275,7 @@ namespace UnitTest TEST_F(SliceUpgradeTest, IntermmediateDataTypeChange) { TestDataA::Reflect(m_serializeContext.get()); + AzToolsFramework::Components::EditorComponentBase::Reflect(m_serializeContext.get()); TestComponentA_V0::Reflect(m_serializeContext.get()); AZ::Entity* entityA = aznew AZ::Entity(); TestComponentA_V0* component = entityA->CreateComponent(); @@ -320,6 +321,7 @@ namespace UnitTest TEST_F(SliceUpgradeTest, TypeChangeInUnorderedMap) { TestDataB_V0::Reflect(m_serializeContext.get()); + AzToolsFramework::Components::EditorComponentBase::Reflect(m_serializeContext.get()); TestComponentB_V0::Reflect(m_serializeContext.get()); AZ::Entity* entityA = aznew AZ::Entity(); TestComponentB_V0* componentB = entityA->CreateComponent(); @@ -395,6 +397,7 @@ namespace UnitTest TEST_F(SliceUpgradeTest, TypeChangeInVector) { TestDataB_V0::Reflect(m_serializeContext.get()); + AzToolsFramework::Components::EditorComponentBase::Reflect(m_serializeContext.get()); TestComponentC_V0::Reflect(m_serializeContext.get()); AZ::Entity* entityA = aznew AZ::Entity(); TestComponentC_V0* componentC = entityA->CreateComponent(); @@ -452,6 +455,7 @@ namespace UnitTest TEST_F(SliceUpgradeTest, UpgradeSkipVersion_TypeChange_FloatToDouble) { // 1. Create an entity with a TestComponentE_V4 with the default value for m_data + AzToolsFramework::Components::EditorComponentBase::Reflect(m_serializeContext.get()); TestComponentE_V4::Reflect(m_serializeContext.get()); AZ::Entity* testEntity = aznew AZ::Entity(); TestComponentE_V4* componentEV4 = testEntity->CreateComponent(); @@ -563,6 +567,7 @@ namespace UnitTest SliceUpgradeTestAsset::Reflect(m_serializeContext.get()); AzFramework::SimpleAssetReference::Register(*m_serializeContext.get()); + AzToolsFramework::Components::EditorComponentBase::Reflect(m_serializeContext.get()); TestComponentD_V1::Reflect(m_serializeContext.get()); AZ::Entity* entity = aznew AZ::Entity(); entity->CreateComponent(); diff --git a/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp index 05ffc6055f..8c8ebc47e9 100644 --- a/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/ThumbnailerTests.cpp @@ -20,7 +20,6 @@ namespace UnitTest class ThumbnailerTests : public ::testing::Test - , public TraceBusRedirector { protected: void SetUp() override @@ -31,8 +30,6 @@ namespace UnitTest // was running, because the environment wasn't setup for it to save these settings. AZ::UserSettingsComponentRequestBus::Broadcast(&AZ::UserSettingsComponentRequests::DisableSaveOnFinalize); - TraceBusRedirector::BusConnect(); - AZStd::string entityName("test"); AZ::EntityId testEntityId; AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult( @@ -61,8 +58,6 @@ namespace UnitTest void TearDown() override { - TraceBusRedirector::BusDisconnect(); - AzToolsFramework::EditorEntityContextRequestBus::Broadcast( &AzToolsFramework::EditorEntityContextRequestBus::Events::DestroyEditorEntity, m_testEntity->GetId()); diff --git a/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp b/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp index 3007f12192..0c50ca2e00 100644 --- a/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/ToolsComponents/EditorLayerComponentTests.cpp @@ -248,8 +248,6 @@ namespace AzToolsFramework m_app.Stop(); AZ::Debug::TraceMessageBus::Handler::BusDisconnect(); - - } // A few tests save a layer and want to check the state after saving. diff --git a/Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp b/Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp index 57edbf7f74..21631571f5 100644 --- a/Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp +++ b/Code/Framework/AzToolsFramework/Tests/TransformComponent.cpp @@ -975,7 +975,7 @@ namespace UnitTest // AzToolsFramework::Components::TransformComponent // Fixture base class for AzToolsFramework::Components::TransformComponent tests - class EditorTransformComponentTest + class OldEditorTransformComponentTest : public ::testing::Test { protected: @@ -1000,7 +1000,7 @@ namespace UnitTest // Old TransformComponents used to store "Slice Root" entity Id, which could be its own Id. // The version-converter could end up making an entity into its own transform parent. // The EditorEntityFixupComponent should fix this up during slice instantiation. - TEST_F(EditorTransformComponentTest, OldSliceRoots_ShouldHaveNoParent) + TEST_F(OldEditorTransformComponentTest, OldSliceRoots_ShouldHaveNoParent) { const char kSliceData[] = R"DELIMITER( diff --git a/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp b/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp index cf9f95ef31..384edf76ad 100644 --- a/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/UI/EntityPropertyEditorTests.cpp @@ -127,7 +127,6 @@ namespace UnitTest void SetUpEditorFixtureImpl() override { m_editor = new EntityPropertyEditor(); - m_editorActions.Connect(); m_entity1 = CreateDefaultEditorEntity("Entity1"); m_entity2 = CreateDefaultEditorEntity("Entity2"); @@ -137,13 +136,11 @@ namespace UnitTest void TearDownEditorFixtureImpl() override { - m_editorActions.Disconnect(); delete m_editor; } public: EntityPropertyEditor* m_editor; - TestEditorActions m_editorActions; EntityIdList m_entityIds; AZ::EntityId m_entity1; AZ::EntityId m_entity2; @@ -234,8 +231,6 @@ namespace UnitTest entities.insert(m_levelEntity); m_levelEditor->SetOverrideEntityIds(entities); - m_editorActions.Connect(); - // Connect to the EditorRequestBus so that we can intercept calls checking whether or not a level is currently open. AzToolsFramework::EditorRequestBus::Handler::BusConnect(); } @@ -244,7 +239,6 @@ namespace UnitTest { AzToolsFramework::EditorRequestBus::Handler::BusDisconnect(); - m_editorActions.Disconnect(); delete m_levelEditor; } @@ -258,7 +252,6 @@ namespace UnitTest public: EntityPropertyEditor* m_levelEditor; - TestEditorActions m_editorActions; AZ::EntityId m_levelEntity; bool m_levelOpen = false; }; diff --git a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp index f1d282e869..7480c937f4 100644 --- a/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/Viewport/ViewportUiWidgetManagerTests.cpp @@ -85,19 +85,8 @@ namespace UnitTest } class ViewportUiWidgetAssertFixture - : public ::testing::Test - , UnitTest::TraceBusRedirector - { - public: - void SetUp() override - { - AZ::Debug::TraceMessageBus::Handler::BusConnect(); - } - void TearDown() override - { - AZ::Debug::TraceMessageBus::Handler::BusDisconnect(); - } - }; + : public ScopedAllocatorSetupFixture + {}; TEST_F(ViewportUiWidgetAssertFixture, RegisterUpdateCallbackDoesNotRegisterFunctionForNotAddedObject) { From 158e25bd23e4aa5618cb31c712b81b50913083ba Mon Sep 17 00:00:00 2001 From: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:22:32 -0500 Subject: [PATCH 033/300] ly_create_alias() now adds the directory it was called from to the (#2120) LY_ALL_TARGET_DIRECTORIES property if that directory has not already been added This addresses an issue where if a CMakeLists.txt contains a call to ly_create_alias(), but NOT a call to ly_add_target, it would not be added to the generated CMakeLists.txt for the install layout Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com> --- Gems/Atom/CMakeLists.txt | 8 -------- .../AtomBridge/Code/CMakeLists.txt | 15 +++++++++++++++ Gems/AtomLyIntegration/CMakeLists.txt | 8 -------- cmake/Gems.cmake | 7 +++++++ 4 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Gems/Atom/CMakeLists.txt b/Gems/Atom/CMakeLists.txt index 8dc38ec7ad..3c7a6951f6 100644 --- a/Gems/Atom/CMakeLists.txt +++ b/Gems/Atom/CMakeLists.txt @@ -14,11 +14,3 @@ add_subdirectory(RPI) add_subdirectory(Tools) add_subdirectory(Utils) -# The "Atom" Gem will alias the real Atom_AtomBridge target variants -# allows the enabling and disabling the "Atom" Gem to build the pre-requisite dependencies -ly_create_alias(NAME Atom.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients) -ly_create_alias(NAME Atom.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers) -if(PAL_TRAIT_BUILD_HOST_TOOLS) - ly_create_alias(NAME Atom.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders) - ly_create_alias(NAME Atom.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools) -endif() diff --git a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt index bd535dee72..db14ca1751 100644 --- a/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt +++ b/Gems/AtomLyIntegration/AtomBridge/Code/CMakeLists.txt @@ -115,3 +115,18 @@ if(PAL_TRAIT_BUILD_HOST_TOOLS) ly_create_alias(NAME Atom_AtomBridge.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Editor) ly_create_alias(NAME Atom_AtomBridge.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Editor) endif() + +# The "Atom" Gem will alias the real Atom_AtomBridge target variants +# allows the enabling and disabling the "Atom" Gem to build the pre-requisite dependencies +# The "AtomLyIntegration" Gem will also alias the real Atom_AtomBridge target variants +# The Atom Gem does the same at the moment. +ly_create_alias(NAME Atom.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients) +ly_create_alias(NAME Atom.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers) +ly_create_alias(NAME AtomLyIntegration.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients) +ly_create_alias(NAME AtomLyIntegration.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers) +if(PAL_TRAIT_BUILD_HOST_TOOLS) + ly_create_alias(NAME Atom.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders) + ly_create_alias(NAME Atom.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools) + ly_create_alias(NAME AtomLyIntegration.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders) + ly_create_alias(NAME AtomLyIntegration.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools) +endif() diff --git a/Gems/AtomLyIntegration/CMakeLists.txt b/Gems/AtomLyIntegration/CMakeLists.txt index 35d4d388a6..3620d5152a 100644 --- a/Gems/AtomLyIntegration/CMakeLists.txt +++ b/Gems/AtomLyIntegration/CMakeLists.txt @@ -15,11 +15,3 @@ add_subdirectory(AtomBridge) add_subdirectory(AtomViewportDisplayInfo) add_subdirectory(AtomViewportDisplayIcons) -# The "AtomLyIntegration" Gem will also alias the real Atom_AtomBridge target variants -# The Atom Gem does the same at the moment. -ly_create_alias(NAME AtomLyIntegration.Clients NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Clients) -ly_create_alias(NAME AtomLyIntegration.Servers NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Servers) -if(PAL_TRAIT_BUILD_HOST_TOOLS) - ly_create_alias(NAME AtomLyIntegration.Builders NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Builders) - ly_create_alias(NAME AtomLyIntegration.Tools NAMESPACE Gem TARGETS Gem::Atom_AtomBridge.Tools) -endif() diff --git a/cmake/Gems.cmake b/cmake/Gems.cmake index b120c28db3..b5fc0d158c 100644 --- a/cmake/Gems.cmake +++ b/cmake/Gems.cmake @@ -90,6 +90,13 @@ function(ly_create_alias) # Replace the CMake list separator with a space to replicate the space separated TARGETS arguments string(REPLACE ";" " " create_alias_args "${ly_create_alias_NAME},${ly_create_alias_NAMESPACE},${ly_create_alias_TARGETS}") set_property(DIRECTORY APPEND PROPERTY LY_CREATE_ALIAS_ARGUMENTS "${create_alias_args}") + + # Store the directory path in the GLOBAL property so that it can be accessed + # in the layout install logic. Skip if the directory has already been added + get_property(ly_all_target_directories GLOBAL PROPERTY LY_ALL_TARGET_DIRECTORIES) + if(NOT CMAKE_CURRENT_SOURCE_DIR IN_LIST ly_all_target_directories) + set_property(GLOBAL APPEND PROPERTY LY_ALL_TARGET_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}) + endif() endfunction() # ly_enable_gems From 7b1fe069e5029647af406f0915e2822ad708443f Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 19:07:54 -0700 Subject: [PATCH 034/300] WhiteBox Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Source/Asset/EditorWhiteBoxMeshAsset.cpp | 2 -- .../Source/Asset/WhiteBoxMeshAssetHandler.cpp | 2 -- .../Asset/WhiteBoxMeshAssetUndoCommand.cpp | 2 -- .../EditorWhiteBoxColliderComponent.cpp | 2 -- .../Components/WhiteBoxColliderComponent.cpp | 2 -- .../WhiteBoxColliderConfiguration.cpp | 2 -- .../WhiteBoxColliderConfiguration.h | 3 +++ .../Code/Source/Core/WhiteBoxToolApi.cpp | 2 -- .../Code/Source/EditorWhiteBoxComponent.cpp | 2 -- .../Source/EditorWhiteBoxComponentMode.cpp | 2 -- .../EditorWhiteBoxComponentModeTypes.cpp | 2 -- .../Source/EditorWhiteBoxSystemComponent.cpp | 2 -- .../Rendering/Atom/TangentSpaceHelper.cpp | 3 +-- .../Rendering/Atom/WhiteBoxAtomRenderMesh.cpp | 2 -- .../Rendering/Atom/WhiteBoxMeshAtomData.cpp | 2 -- .../Source/Rendering/WhiteBoxMaterial.cpp | 2 -- .../Rendering/WhiteBoxNullRenderMesh.cpp | 2 -- .../Source/Rendering/WhiteBoxRenderData.cpp | 2 -- .../Rendering/WhiteBoxRenderMeshInterface.cpp | 2 -- .../EditorWhiteBoxComponentModeCommon.cpp | 2 -- .../EditorWhiteBoxDefaultMode.cpp | 2 -- .../EditorWhiteBoxEdgeRestoreMode.cpp | 2 -- .../Code/Source/Util/WhiteBoxEditorUtil.cpp | 2 -- .../Code/Source/Util/WhiteBoxMathUtil.cpp | 2 -- .../Code/Source/Util/WhiteBoxMathUtil.h | 7 ++++++ .../Code/Source/Util/WhiteBoxTextureUtil.cpp | 2 -- .../Viewport/WhiteBoxEdgeScaleModifier.cpp | 2 -- .../WhiteBoxEdgeTranslationModifier.cpp | 2 -- .../WhiteBoxEdgeTranslationModifier.h | 1 + .../Viewport/WhiteBoxManipulatorBounds.cpp | 2 -- .../Viewport/WhiteBoxManipulatorViews.cpp | 2 -- .../Source/Viewport/WhiteBoxModifierUtil.cpp | 2 -- .../Viewport/WhiteBoxPolygonScaleModifier.cpp | 2 -- .../WhiteBoxPolygonTranslationModifier.cpp | 2 -- .../WhiteBoxVertexTranslationModifier.cpp | 2 -- .../Viewport/WhiteBoxViewportConstants.cpp | 2 -- .../Code/Source/WhiteBoxAllocator.cpp | 2 -- Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h | 2 +- .../Code/Source/WhiteBoxComponent.cpp | 2 -- .../Code/Source/WhiteBoxEditorModule.cpp | 2 -- Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp | 2 -- .../Code/Source/WhiteBoxSystemComponent.cpp | 2 -- .../Code/Source/WhiteBoxToolApiReflection.cpp | 2 -- .../Code/Source/WhiteBox_precompiled.h | 22 ------------------- .../Code/Tests/WhiteBoxComponentTest.cpp | 2 -- Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp | 2 -- .../Code/Tests/WhiteBoxPhysicsTest.cpp | 2 -- .../Code/Tests/WhiteBoxRenderDataTest.cpp | 2 -- .../Code/Tests/WhiteBoxRuntimeTest.cpp | 2 -- .../Code/Tests/WhiteBoxSelectionTest.cpp | 2 -- Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp | 2 -- .../Tests/WhiteBoxTestRailsAutomation.cpp | 2 -- Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp | 2 -- Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp | 2 -- .../Code/whitebox_supported_files.cmake | 1 - 55 files changed, 13 insertions(+), 122 deletions(-) delete mode 100644 Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h diff --git a/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp b/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp index 8abd7d2a75..3e4b9ca555 100644 --- a/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp +++ b/Gems/WhiteBox/Code/Source/Asset/EditorWhiteBoxMeshAsset.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Asset/WhiteBoxMeshAssetHandler.h" #include "Asset/WhiteBoxMeshAssetUndoCommand.h" #include "EditorWhiteBoxMeshAsset.h" diff --git a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp index cc3c7bb682..5038acd0d7 100644 --- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp +++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetHandler.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Asset/WhiteBoxMeshAsset.h" #include "Asset/WhiteBoxMeshAssetHandler.h" diff --git a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp index e6e784e01b..7df22713d7 100644 --- a/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp +++ b/Gems/WhiteBox/Code/Source/Asset/WhiteBoxMeshAssetUndoCommand.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Asset/WhiteBoxMeshAssetBus.h" #include "WhiteBoxMeshAssetUndoCommand.h" diff --git a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp index 9d43c0b8fa..00fdd881bb 100644 --- a/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp +++ b/Gems/WhiteBox/Code/Source/Components/EditorWhiteBoxColliderComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxColliderComponent.h" #include "EditorWhiteBoxComponent.h" #include "WhiteBoxColliderComponent.h" diff --git a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp index e616d3567e..225dcac33d 100644 --- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp +++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxColliderComponent.h" #include diff --git a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp index f23dea356b..99874813f3 100644 --- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp +++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxColliderConfiguration.h" #include diff --git a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h index 348feb48e7..5aa1f64f97 100644 --- a/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h +++ b/Gems/WhiteBox/Code/Source/Components/WhiteBoxColliderConfiguration.h @@ -7,6 +7,9 @@ #pragma once +#include +#include + namespace AZ { class ReflectContext; diff --git a/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp b/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp index f380a54432..1cb2d9142f 100644 --- a/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp +++ b/Gems/WhiteBox/Code/Source/Core/WhiteBoxToolApi.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Util/WhiteBoxMathUtil.h" #include "Util/WhiteBoxTextureUtil.h" diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp index f003b18808..5c824660c3 100644 --- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp +++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Asset/EditorWhiteBoxMeshAsset.h" #include "Asset/WhiteBoxMeshAssetHandler.h" #include "EditorWhiteBoxComponent.h" diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp index c228a789f8..ee4d9835c6 100644 --- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp +++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentMode.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentMode.h" #include "SubComponentModes/EditorWhiteBoxDefaultMode.h" #include "SubComponentModes/EditorWhiteBoxEdgeRestoreMode.h" diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp index a61c18acc4..8b51c771b9 100644 --- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp +++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxComponentModeTypes.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeTypes.h" #include diff --git a/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp b/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp index 426e311b64..75e40d19ca 100644 --- a/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp +++ b/Gems/WhiteBox/Code/Source/EditorWhiteBoxSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Asset/WhiteBoxMeshAsset.h" #include "Asset/WhiteBoxMeshAssetHandler.h" #include "EditorWhiteBoxSystemComponent.h" diff --git a/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp b/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp index 5ca1b3e79f..ad52f9a180 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp +++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/TangentSpaceHelper.cpp @@ -5,11 +5,10 @@ * */ -#include "WhiteBox_precompiled.h" - #include "TangentSpaceHelper.h" #include +#include namespace WhiteBox { diff --git a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp index 4c13a63308..e7c737d9fa 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp +++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxAtomRenderMesh.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxAtomRenderMesh.h" #include diff --git a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp index 11a52e145e..7fcabbb1f3 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp +++ b/Gems/WhiteBox/Code/Source/Rendering/Atom/WhiteBoxMeshAtomData.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "TangentSpaceHelper.h" #include "WhiteBoxMeshAtomData.h" diff --git a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp index 6d70dee48e..231423990e 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp +++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxMaterial.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxMaterial.h" #include diff --git a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp index 7060e983e6..c5c9a9c606 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp +++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxNullRenderMesh.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxNullRenderMesh.h" namespace WhiteBox diff --git a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp index bcb1e62209..d74e2e02e9 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp +++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderData.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxRenderData.h" #include diff --git a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp index 088c6c4b28..2e33ecd915 100644 --- a/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp +++ b/Gems/WhiteBox/Code/Source/Rendering/WhiteBoxRenderMeshInterface.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxRenderMeshInterface.h" namespace WhiteBox diff --git a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp index e199509ad7..aac02df4ef 100644 --- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp +++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxComponentModeCommon.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeCommon.h" #include diff --git a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp index e9b5514006..a56966a631 100644 --- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp +++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxDefaultMode.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeCommon.h" #include "EditorWhiteBoxDefaultMode.h" #include "Viewport/WhiteBoxEdgeScaleModifier.h" diff --git a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp index 0abc6ffa60..99ebb326a0 100644 --- a/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp +++ b/Gems/WhiteBox/Code/Source/SubComponentModes/EditorWhiteBoxEdgeRestoreMode.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeCommon.h" #include "EditorWhiteBoxEdgeRestoreMode.h" #include "Viewport/WhiteBoxModifierUtil.h" diff --git a/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp b/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp index 9643925907..acb73d09ac 100644 --- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp +++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxEditorUtil.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include #include diff --git a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp index f9014333a2..003cf80f6f 100644 --- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp +++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxMathUtil.h" #include diff --git a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h index 2fbda90c8e..5eedaa7bdb 100644 --- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h +++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxMathUtil.h @@ -7,6 +7,13 @@ #pragma once +namespace AZ +{ + class Quaternion; + class Transform; + class Vector3; +} + namespace WhiteBox { //! Intersect a segment with a cylinder diff --git a/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp b/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp index 8e9680e65b..e1cfde401e 100644 --- a/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp +++ b/Gems/WhiteBox/Code/Source/Util/WhiteBoxTextureUtil.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxTextureUtil.h" #include diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp index 2ce08fc5ce..4bdce778bb 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeScaleModifier.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "SubComponentModes/EditorWhiteBoxDefaultModeBus.h" #include "Util/WhiteBoxMathUtil.h" #include "Viewport/WhiteBoxViewportConstants.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp index 8c7d59f3b8..db07717325 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeBus.h" #include "EditorWhiteBoxEdgeModifierBus.h" #include "SubComponentModes/EditorWhiteBoxDefaultModeBus.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h index 34095c04be..6d61f745a1 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxEdgeTranslationModifier.h @@ -9,6 +9,7 @@ #include "Viewport/WhiteBoxViewportConstants.h" +#include #include #include diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp index 32fa42f69a..2018076190 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorBounds.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Util/WhiteBoxMathUtil.h" #include "WhiteBoxManipulatorBounds.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp index 66a2cd0ca4..3c7b6fb8e8 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxManipulatorViews.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Viewport/WhiteBoxManipulatorBounds.h" #include "Viewport/WhiteBoxViewportConstants.h" #include "WhiteBoxManipulatorViews.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp index ae34217981..83b0ab8591 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxModifierUtil.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeTypes.h" #include "WhiteBoxModifierUtil.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp index db49ae0679..cc86231a36 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonScaleModifier.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxPolygonModifierBus.h" #include "SubComponentModes/EditorWhiteBoxDefaultModeBus.h" #include "Util/WhiteBoxMathUtil.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp index 833b887ef4..6ad468d373 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxPolygonTranslationModifier.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeBus.h" #include "EditorWhiteBoxPolygonModifierBus.h" #include "SubComponentModes/EditorWhiteBoxDefaultModeBus.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp index 07a17ac2cb..a7ec8d92f4 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxVertexTranslationModifier.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "SubComponentModes/EditorWhiteBoxDefaultModeBus.h" #include "Util/WhiteBoxMathUtil.h" #include "Viewport/WhiteBoxModifierUtil.h" diff --git a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp index 86808cecdc..8b059b1296 100644 --- a/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp +++ b/Gems/WhiteBox/Code/Source/Viewport/WhiteBoxViewportConstants.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxViewportConstants.h" namespace WhiteBox diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp index 86ea1a974a..a7309fd5c7 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp +++ b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxAllocator.h" namespace WhiteBox diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h index 5aad1a687e..46229e07c4 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h +++ b/Gems/WhiteBox/Code/Source/WhiteBoxAllocator.h @@ -8,7 +8,7 @@ #pragma once #include -#include +#include namespace WhiteBox { diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp index 6951135895..d95c9de39a 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp +++ b/Gems/WhiteBox/Code/Source/WhiteBoxComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxComponent.h" #include diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp index c3b5445ed7..a9066ac44a 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp +++ b/Gems/WhiteBox/Code/Source/WhiteBoxEditorModule.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Components/EditorWhiteBoxColliderComponent.h" #include "EditorWhiteBoxComponent.h" #include "EditorWhiteBoxSystemComponent.h" diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp index e7e5bb9128..a6bfed01f5 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp +++ b/Gems/WhiteBox/Code/Source/WhiteBoxModule.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Components/WhiteBoxColliderComponent.h" #include "WhiteBoxAllocator.h" #include "WhiteBoxComponent.h" diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp index 0c364e37f0..03b06655cf 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp +++ b/Gems/WhiteBox/Code/Source/WhiteBoxSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Asset/WhiteBoxMeshAssetHandler.h" #include "Rendering/Atom/WhiteBoxAtomRenderMesh.h" #include "WhiteBoxSystemComponent.h" diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp index dca96186f9..820041875f 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp +++ b/Gems/WhiteBox/Code/Source/WhiteBoxToolApiReflection.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "EditorWhiteBoxComponentModeBus.h" #include "WhiteBoxToolApiReflection.h" diff --git a/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h b/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h deleted file mode 100644 index 2f7e53eb31..0000000000 --- a/Gems/WhiteBox/Code/Source/WhiteBox_precompiled.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include // many CryCommon files require that this is included first. - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp index dce88122c3..3ab820b99e 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxComponentTest.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Asset/EditorWhiteBoxMeshAsset.h" #include "EditorWhiteBoxComponentMode.h" #include "EditorWhiteBoxPolygonModifierBus.h" diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp index d30a7e2283..35514ba1b4 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxEdgeTest.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxTestFixtures.h" #include "WhiteBoxTestUtil.h" diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp index 513c8a90bf..6f98789570 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxPhysicsTest.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Components/EditorWhiteBoxColliderComponent.h" #include "Components/WhiteBoxColliderComponent.h" #include "WhiteBox/EditorWhiteBoxComponentBus.h" diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp index 0fb49d7b0f..ea21922726 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxRenderDataTest.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxTestFixtures.h" #include diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp index 6aca4296e2..7f89b6690e 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxRuntimeTest.cpp @@ -5,8 +5,6 @@ * */ -#include - #include TEST(WhiteBox, PlaceholderTest) diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp index 5f04fc50ad..7070b24ab1 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxSelectionTest.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Viewport/WhiteBoxManipulatorBounds.h" #include "WhiteBoxTestFixtures.h" diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp index e53bf1f24f..7f31b8e445 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTest.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxTestFixtures.h" #include "WhiteBoxTestUtil.h" diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp index c5e892a990..79d65c3195 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTestRailsAutomation.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxTestFixtures.h" #include "WhiteBoxTestUtil.h" diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp index 80dc272dde..e5cafdc8f2 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxTestUtil.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "WhiteBoxTestUtil.h" namespace WhiteBox diff --git a/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp b/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp index d3be243903..a7cf8a8eaf 100644 --- a/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp +++ b/Gems/WhiteBox/Code/Tests/WhiteBoxUVTest.cpp @@ -5,8 +5,6 @@ * */ -#include "WhiteBox_precompiled.h" - #include "Util/WhiteBoxTextureUtil.h" #include "WhiteBoxTestFixtures.h" #include "Rendering/Atom/WhiteBoxMeshAtomData.h" diff --git a/Gems/WhiteBox/Code/whitebox_supported_files.cmake b/Gems/WhiteBox/Code/whitebox_supported_files.cmake index 870885ccfd..95ab376b53 100644 --- a/Gems/WhiteBox/Code/whitebox_supported_files.cmake +++ b/Gems/WhiteBox/Code/whitebox_supported_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/WhiteBox_precompiled.h Include/WhiteBox/WhiteBoxBus.h Source/WhiteBoxAllocator.cpp Source/WhiteBoxAllocator.h From 58fbd8a5d7adecbb4c412dcac2013bf61c2d8bfc Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 19:19:56 -0700 Subject: [PATCH 035/300] WhiteBoxUnsupported Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp | 2 -- .../Code/Source/WhiteBoxUnsupported_precompiled.h | 8 -------- Gems/WhiteBox/Code/whitebox_unsupported_files.cmake | 1 - 3 files changed, 11 deletions(-) delete mode 100644 Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp b/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp index f0796d621c..61ead9ae22 100644 --- a/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp +++ b/Gems/WhiteBox/Code/Source/WhiteBoxModuleUnsupported.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #if defined(WHITE_BOX_EDITOR) diff --git a/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h b/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h deleted file mode 100644 index cc8a920d01..0000000000 --- a/Gems/WhiteBox/Code/Source/WhiteBoxUnsupported_precompiled.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once diff --git a/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake b/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake index dac84c280f..79204b2047 100644 --- a/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake +++ b/Gems/WhiteBox/Code/whitebox_unsupported_files.cmake @@ -7,5 +7,4 @@ set(FILES Source/WhiteBoxModuleUnsupported.cpp - Source/WhiteBoxUnsupported_precompiled.h ) From 4e891d8655dfdd57ee045791dd98074be1404c68 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 19:51:10 -0700 Subject: [PATCH 036/300] FastNoise Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/FastNoise/Code/External/FastNoise/FastNoise.cpp | 2 -- .../Code/Source/EditorFastNoiseGradientComponent.cpp | 1 - Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp | 1 - Gems/FastNoise/Code/Source/FastNoiseEditorModule.h | 1 - .../FastNoise/Code/Source/FastNoiseGradientComponent.cpp | 2 -- Gems/FastNoise/Code/Source/FastNoiseModule.cpp | 2 -- Gems/FastNoise/Code/Source/FastNoiseModule.h | 1 - Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp | 2 -- Gems/FastNoise/Code/Source/FastNoise_precompiled.h | 9 --------- Gems/FastNoise/Code/Tests/FastNoiseTest.cpp | 1 - Gems/FastNoise/Code/fastnoise_files.cmake | 1 - 11 files changed, 23 deletions(-) delete mode 100644 Gems/FastNoise/Code/Source/FastNoise_precompiled.h diff --git a/Gems/FastNoise/Code/External/FastNoise/FastNoise.cpp b/Gems/FastNoise/Code/External/FastNoise/FastNoise.cpp index 7c8748c46f..51980ca08a 100644 --- a/Gems/FastNoise/Code/External/FastNoise/FastNoise.cpp +++ b/Gems/FastNoise/Code/External/FastNoise/FastNoise.cpp @@ -28,8 +28,6 @@ // Modified from original -#include "FastNoise_precompiled.h" - #include "FastNoise.h" #include diff --git a/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp index 881839dd52..64e19e0000 100644 --- a/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp +++ b/Gems/FastNoise/Code/Source/EditorFastNoiseGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "FastNoise_precompiled.h" #include "EditorFastNoiseGradientComponent.h" namespace FastNoiseGem diff --git a/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp index d3d92b81bf..6bbd2c816d 100644 --- a/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp +++ b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.cpp @@ -5,7 +5,6 @@ * */ -#include "FastNoise_precompiled.h" #include #include #include diff --git a/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h index 75eb7f163a..a517094b32 100644 --- a/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h +++ b/Gems/FastNoise/Code/Source/FastNoiseEditorModule.h @@ -7,7 +7,6 @@ #pragma once -#include "FastNoise_precompiled.h" #include namespace FastNoiseGem diff --git a/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp b/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp index ec6f16482d..d1d6b589d3 100644 --- a/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp +++ b/Gems/FastNoise/Code/Source/FastNoiseGradientComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "FastNoise_precompiled.h" - #include "FastNoiseGradientComponent.h" #include #include diff --git a/Gems/FastNoise/Code/Source/FastNoiseModule.cpp b/Gems/FastNoise/Code/Source/FastNoiseModule.cpp index 46b3fbafd0..0190d1e6bd 100644 --- a/Gems/FastNoise/Code/Source/FastNoiseModule.cpp +++ b/Gems/FastNoise/Code/Source/FastNoiseModule.cpp @@ -5,8 +5,6 @@ * */ -#include "FastNoise_precompiled.h" - #include #include #include diff --git a/Gems/FastNoise/Code/Source/FastNoiseModule.h b/Gems/FastNoise/Code/Source/FastNoiseModule.h index 9a42740f7f..3ef409944d 100644 --- a/Gems/FastNoise/Code/Source/FastNoiseModule.h +++ b/Gems/FastNoise/Code/Source/FastNoiseModule.h @@ -7,7 +7,6 @@ #pragma once -#include "FastNoise_precompiled.h" #include namespace FastNoiseGem diff --git a/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp b/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp index 2973cd4ecc..dd8c0bcfe2 100644 --- a/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp +++ b/Gems/FastNoise/Code/Source/FastNoiseSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "FastNoise_precompiled.h" - #include #include diff --git a/Gems/FastNoise/Code/Source/FastNoise_precompiled.h b/Gems/FastNoise/Code/Source/FastNoise_precompiled.h deleted file mode 100644 index d424689241..0000000000 --- a/Gems/FastNoise/Code/Source/FastNoise_precompiled.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp b/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp index 2b39128b16..8965804c1d 100644 --- a/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp +++ b/Gems/FastNoise/Code/Tests/FastNoiseTest.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "FastNoise_precompiled.h" #include #include diff --git a/Gems/FastNoise/Code/fastnoise_files.cmake b/Gems/FastNoise/Code/fastnoise_files.cmake index 4b14feaa7b..fdaedb33eb 100644 --- a/Gems/FastNoise/Code/fastnoise_files.cmake +++ b/Gems/FastNoise/Code/fastnoise_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/FastNoise_precompiled.h Include/FastNoise/Ebuses/FastNoiseBus.h Include/FastNoise/Ebuses/FastNoiseGradientRequestBus.h Source/FastNoiseSystemComponent.cpp From 33a19b05bcb55d0de6b31739b002c9867632462b Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 19:51:39 -0700 Subject: [PATCH 037/300] GradientSignal Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/Components/ConstantGradientComponent.cpp | 1 - .../Code/Source/Components/DitherGradientComponent.cpp | 1 - .../Source/Components/GradientSurfaceDataComponent.cpp | 1 - .../Source/Components/GradientTransformComponent.cpp | 1 - .../Code/Source/Components/ImageGradientComponent.cpp | 1 - .../Code/Source/Components/InvertGradientComponent.cpp | 1 - .../Code/Source/Components/LevelsGradientComponent.cpp | 1 - .../Code/Source/Components/MixedGradientComponent.cpp | 1 - .../Code/Source/Components/PerlinGradientComponent.cpp | 1 - .../Source/Components/PosterizeGradientComponent.cpp | 1 - .../Code/Source/Components/RandomGradientComponent.cpp | 1 - .../Source/Components/ReferenceGradientComponent.cpp | 1 - .../Components/ShapeAreaFalloffGradientComponent.cpp | 1 - .../Source/Components/SmoothStepGradientComponent.cpp | 1 - .../Components/SurfaceAltitudeGradientComponent.cpp | 1 - .../Source/Components/SurfaceMaskGradientComponent.cpp | 1 - .../Source/Components/SurfaceSlopeGradientComponent.cpp | 1 - .../Source/Components/ThresholdGradientComponent.cpp | 1 - .../Source/Editor/EditorConstantGradientComponent.cpp | 1 - .../Code/Source/Editor/EditorDitherGradientComponent.cpp | 1 - .../Code/Source/Editor/EditorGradientComponentBase.cpp | 1 - .../Source/Editor/EditorGradientSurfaceDataComponent.cpp | 1 - .../Source/Editor/EditorGradientTransformComponent.cpp | 1 - .../Code/Source/Editor/EditorImageBuilderComponent.cpp | 1 - .../Code/Source/Editor/EditorImageGradientComponent.cpp | 1 - .../Editor/EditorImageProcessingSystemComponent.cpp | 1 - .../Code/Source/Editor/EditorInvertGradientComponent.cpp | 1 - .../Code/Source/Editor/EditorLevelsGradientComponent.cpp | 1 - .../Code/Source/Editor/EditorMixedGradientComponent.cpp | 1 - .../Code/Source/Editor/EditorPerlinGradientComponent.cpp | 1 - .../Source/Editor/EditorPosterizeGradientComponent.cpp | 1 - .../Code/Source/Editor/EditorRandomGradientComponent.cpp | 1 - .../Source/Editor/EditorReferenceGradientComponent.cpp | 1 - .../Editor/EditorShapeAreaFalloffGradientComponent.cpp | 1 - .../Source/Editor/EditorSmoothStepGradientComponent.cpp | 1 - .../Editor/EditorSurfaceAltitudeGradientComponent.cpp | 1 - .../Source/Editor/EditorSurfaceMaskGradientComponent.cpp | 1 - .../Editor/EditorSurfaceSlopeGradientComponent.cpp | 1 - .../Source/Editor/EditorThresholdGradientComponent.cpp | 1 - .../Code/Source/GradientImageConversion.cpp | 2 -- Gems/GradientSignal/Code/Source/GradientSampler.cpp | 1 - .../Code/Source/GradientSignalEditorModule.cpp | 1 - .../Code/Source/GradientSignalEditorModule.h | 1 - Gems/GradientSignal/Code/Source/GradientSignalModule.cpp | 1 - Gems/GradientSignal/Code/Source/GradientSignalModule.h | 1 - .../Code/Source/GradientSignalSystemComponent.cpp | 1 - .../Code/Source/GradientSignal_precompiled.h | 9 --------- Gems/GradientSignal/Code/Source/ImageAsset.cpp | 1 - Gems/GradientSignal/Code/Source/ImageSettings.cpp | 1 - Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp | 1 - Gems/GradientSignal/Code/Source/SmoothStep.cpp | 1 - .../Code/Source/UI/GradientPreviewDataWidget.cpp | 1 - .../Code/Source/UI/GradientPreviewWidget.cpp | 1 - Gems/GradientSignal/Code/Source/Util.cpp | 1 - .../Code/Tests/EditorGradientSignalPreviewTests.cpp | 1 - .../Code/Tests/GradientSignalImageTests.cpp | 1 - .../Code/Tests/GradientSignalReferencesTests.cpp | 1 - .../Code/Tests/GradientSignalServicesTests.cpp | 1 - .../Code/Tests/GradientSignalSurfaceTests.cpp | 1 - Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp | 1 - Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp | 1 - Gems/GradientSignal/Code/gradientsignal_files.cmake | 1 - 62 files changed, 71 deletions(-) delete mode 100644 Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h diff --git a/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp index 7cb7ef928e..8a5b2d1e68 100644 --- a/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/ConstantGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "ConstantGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp index 2730cfafba..4e48565768 100644 --- a/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/DitherGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "DitherGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp b/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp index c19ad7e5b0..6432a44c6a 100644 --- a/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/GradientSurfaceDataComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "GradientSurfaceDataComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp index 617bdc759f..870049c22c 100644 --- a/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/GradientTransformComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "GradientTransformComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp index 21378d705e..c4c4933a50 100644 --- a/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/ImageGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "ImageGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp index 1d8f742a31..01c85a3035 100644 --- a/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/InvertGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "InvertGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp index 950cc3b4b6..02ec9b0f02 100644 --- a/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/LevelsGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "LevelsGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp index 722ade48a0..43080b1971 100644 --- a/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/MixedGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "MixedGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp index fed2c49590..f419b395f7 100644 --- a/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/PerlinGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "PerlinGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp index 0346c0adf9..f6f585d0fc 100644 --- a/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/PosterizeGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "PosterizeGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp index 8268fd2a7b..bd256fd76d 100644 --- a/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/RandomGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "RandomGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp index c3b97e41e2..6ac69ac754 100644 --- a/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/ReferenceGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "ReferenceGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp index 943ffca2e2..6f142d278a 100644 --- a/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/ShapeAreaFalloffGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "ShapeAreaFalloffGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp index 262c12fb10..7c65a2c3da 100644 --- a/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/SmoothStepGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "SmoothStepGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp index 23a4d122d6..2c75ac1cc9 100644 --- a/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/SurfaceAltitudeGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "SurfaceAltitudeGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp index 0c7331a64a..365bbee33d 100644 --- a/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/SurfaceMaskGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "SurfaceMaskGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp index bb7e5b3528..c0f26e6d8a 100644 --- a/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/SurfaceSlopeGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "SurfaceSlopeGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp index 04819dd27a..cee0e4945b 100644 --- a/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Components/ThresholdGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "ThresholdGradientComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp index 78b7fcb3b4..86af02501d 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorConstantGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorConstantGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp index cd5e302cb5..6c488ef29a 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorDitherGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorDitherGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp index 12407bdc7c..4b48d17dce 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientComponentBase.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp index dd9079d118..a225780e3d 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientSurfaceDataComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorGradientSurfaceDataComponent.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp index fb8cbde476..674c23cef8 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorGradientTransformComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorGradientTransformComponent.h" #include diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp index f2bae481f8..750396bc64 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageBuilderComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorImageBuilderComponent.h" #include diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp index 4c7901223f..b858e870a9 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorImageGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp index 907fc3fcb4..9e6e4fab3e 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorImageProcessingSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorImageProcessingSystemComponent.h" #include diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp index 1fdfcdfc69..115e263fe9 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorInvertGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorInvertGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp index eb3652ff08..c0360b276d 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorLevelsGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorLevelsGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp index e78b6f1706..4bcac8681a 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorMixedGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorMixedGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp index 58c814bfc7..1cdc7b6f11 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorPerlinGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorPerlinGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp index 1ab1f5e480..f2785540e9 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorPosterizeGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorPosterizeGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp index 310b188f43..d6bf830483 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorRandomGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorRandomGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp index 40b62c78e2..d263a87f20 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorReferenceGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorReferenceGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp index 2d8d471d2d..e79cc103ed 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorShapeAreaFalloffGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorShapeAreaFalloffGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp index 98fd56c0b1..1c248dd5a5 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorSmoothStepGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorSmoothStepGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp index 290eda59c5..c0dd2c4e5f 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceAltitudeGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorSurfaceAltitudeGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp index 7d5d30c5ea..74186ce2b0 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceMaskGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorSurfaceMaskGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp index 5d36d79b19..ac50bba215 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorSurfaceSlopeGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorSurfaceSlopeGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp index 00bbf97a1e..3ab0a79989 100644 --- a/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp +++ b/Gems/GradientSignal/Code/Source/Editor/EditorThresholdGradientComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "EditorThresholdGradientComponent.h" namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp b/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp index fe3800feda..ed374a489e 100644 --- a/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp +++ b/Gems/GradientSignal/Code/Source/GradientImageConversion.cpp @@ -5,8 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" - #include #include diff --git a/Gems/GradientSignal/Code/Source/GradientSampler.cpp b/Gems/GradientSignal/Code/Source/GradientSampler.cpp index 944eef2e42..1b30cca57a 100644 --- a/Gems/GradientSignal/Code/Source/GradientSampler.cpp +++ b/Gems/GradientSignal/Code/Source/GradientSampler.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include #include diff --git a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp index c4fd0983d2..f80100ad09 100644 --- a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp +++ b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include #include diff --git a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h index c25a9c7e1c..9439c5ed76 100644 --- a/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h +++ b/Gems/GradientSignal/Code/Source/GradientSignalEditorModule.h @@ -7,7 +7,6 @@ #pragma once -#include "GradientSignal_precompiled.h" #include namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp b/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp index b49772656f..9cc827102b 100644 --- a/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp +++ b/Gems/GradientSignal/Code/Source/GradientSignalModule.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/GradientSignalModule.h b/Gems/GradientSignal/Code/Source/GradientSignalModule.h index a056a02fbd..cf4e220d81 100644 --- a/Gems/GradientSignal/Code/Source/GradientSignalModule.h +++ b/Gems/GradientSignal/Code/Source/GradientSignalModule.h @@ -7,7 +7,6 @@ #pragma once -#include "GradientSignal_precompiled.h" #include namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp b/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp index 5c47944859..b325bee83d 100644 --- a/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp +++ b/Gems/GradientSignal/Code/Source/GradientSignalSystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "GradientSignal_precompiled.h" #include "GradientSignalSystemComponent.h" #include diff --git a/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h b/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h deleted file mode 100644 index d424689241..0000000000 --- a/Gems/GradientSignal/Code/Source/GradientSignal_precompiled.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/GradientSignal/Code/Source/ImageAsset.cpp b/Gems/GradientSignal/Code/Source/ImageAsset.cpp index caf76c62af..ec7b6bbd33 100644 --- a/Gems/GradientSignal/Code/Source/ImageAsset.cpp +++ b/Gems/GradientSignal/Code/Source/ImageAsset.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "GradientSignal_precompiled.h" #include diff --git a/Gems/GradientSignal/Code/Source/ImageSettings.cpp b/Gems/GradientSignal/Code/Source/ImageSettings.cpp index 8f7d28dd35..ce94d819f8 100644 --- a/Gems/GradientSignal/Code/Source/ImageSettings.cpp +++ b/Gems/GradientSignal/Code/Source/ImageSettings.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include namespace GradientSignal diff --git a/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp b/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp index fbdaa6a072..a9f4453048 100644 --- a/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp +++ b/Gems/GradientSignal/Code/Source/PerlinImprovedNoise.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include diff --git a/Gems/GradientSignal/Code/Source/SmoothStep.cpp b/Gems/GradientSignal/Code/Source/SmoothStep.cpp index 1ce2f07739..5e543a3f97 100644 --- a/Gems/GradientSignal/Code/Source/SmoothStep.cpp +++ b/Gems/GradientSignal/Code/Source/SmoothStep.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include #include diff --git a/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp b/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp index d82638eda3..11aaa99aeb 100644 --- a/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp +++ b/Gems/GradientSignal/Code/Source/UI/GradientPreviewDataWidget.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "GradientPreviewDataWidget.h" #include diff --git a/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp b/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp index f4039e3807..39974babae 100644 --- a/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp +++ b/Gems/GradientSignal/Code/Source/UI/GradientPreviewWidget.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include diff --git a/Gems/GradientSignal/Code/Source/Util.cpp b/Gems/GradientSignal/Code/Source/Util.cpp index 67ede4e4a3..5a120ad47a 100644 --- a/Gems/GradientSignal/Code/Source/Util.cpp +++ b/Gems/GradientSignal/Code/Source/Util.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include diff --git a/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp b/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp index c2ec4e798f..10cdb470c7 100644 --- a/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp +++ b/Gems/GradientSignal/Code/Tests/EditorGradientSignalPreviewTests.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "Tests/GradientSignalTestMocks.h" #include diff --git a/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp index 8fc95f3a84..c37fcaa16a 100644 --- a/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp +++ b/Gems/GradientSignal/Code/Tests/GradientSignalImageTests.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "Tests/GradientSignalTestMocks.h" diff --git a/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp index e9a9956bac..15f79dc20b 100644 --- a/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp +++ b/Gems/GradientSignal/Code/Tests/GradientSignalReferencesTests.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include diff --git a/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp index 170f978f64..93e3becd29 100644 --- a/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp +++ b/Gems/GradientSignal/Code/Tests/GradientSignalServicesTests.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "Tests/GradientSignalTestMocks.h" #include diff --git a/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp index a0ec74d18b..de5d26c351 100644 --- a/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp +++ b/Gems/GradientSignal/Code/Tests/GradientSignalSurfaceTests.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "GradientSignal_precompiled.h" #include #include diff --git a/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp b/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp index d6457b5bb2..0e4c59f233 100644 --- a/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp +++ b/Gems/GradientSignal/Code/Tests/GradientSignalTest.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include "Tests/GradientSignalTestMocks.h" diff --git a/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp b/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp index 344c2f5868..4e0056d30f 100644 --- a/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp +++ b/Gems/GradientSignal/Code/Tests/ImageAssetTests.cpp @@ -5,7 +5,6 @@ * */ -#include "GradientSignal_precompiled.h" #include #include diff --git a/Gems/GradientSignal/Code/gradientsignal_files.cmake b/Gems/GradientSignal/Code/gradientsignal_files.cmake index cfd3bf60cc..dbe323358a 100644 --- a/Gems/GradientSignal/Code/gradientsignal_files.cmake +++ b/Gems/GradientSignal/Code/gradientsignal_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/GradientSignal_precompiled.h Include/GradientSignal/GradientSampler.h Include/GradientSignal/SmoothStep.h Include/GradientSignal/ImageAsset.h From f91c4a31040c57326e536012e593af37ec2dbc00 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:01:53 -0700 Subject: [PATCH 038/300] Microphone Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/MicrophoneModule.cpp | 2 -- .../Code/Source/MicrophoneSystemComponent.cpp | 2 -- .../Code/Source/Microphone_precompiled.h | 10 ------ .../MicrophoneSystemComponent_Android.cpp | 2 -- .../None/MicrophoneSystemComponent_None.cpp | 1 - .../MicrophoneSystemComponent_Windows.cpp | 32 +++++++++++++++---- .../iOS/MicrophoneSystemComponent_iOS.mm | 2 -- .../Code/Source/SimpleDownsample.cpp | 20 ++++++------ .../Microphone/Code/Source/SimpleDownsample.h | 7 ++-- Gems/Microphone/Code/microphone_files.cmake | 1 - 10 files changed, 38 insertions(+), 41 deletions(-) delete mode 100644 Gems/Microphone/Code/Source/Microphone_precompiled.h diff --git a/Gems/Microphone/Code/Source/MicrophoneModule.cpp b/Gems/Microphone/Code/Source/MicrophoneModule.cpp index 6830ce7fc2..eea9c98bee 100644 --- a/Gems/Microphone/Code/Source/MicrophoneModule.cpp +++ b/Gems/Microphone/Code/Source/MicrophoneModule.cpp @@ -5,8 +5,6 @@ * */ -#include "Microphone_precompiled.h" - #include "MicrophoneSystemComponent.h" #include diff --git a/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp b/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp index 1dee506d97..023062e8f7 100644 --- a/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp +++ b/Gems/Microphone/Code/Source/MicrophoneSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "Microphone_precompiled.h" - #include #include diff --git a/Gems/Microphone/Code/Source/Microphone_precompiled.h b/Gems/Microphone/Code/Source/Microphone_precompiled.h deleted file mode 100644 index eefa26c318..0000000000 --- a/Gems/Microphone/Code/Source/Microphone_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp b/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp index 3bf4fb7410..3b6cb90c09 100644 --- a/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp +++ b/Gems/Microphone/Code/Source/Platform/Android/MicrophoneSystemComponent_Android.cpp @@ -5,8 +5,6 @@ * */ -#include "Microphone_precompiled.h" - #include "MicrophoneSystemComponent.h" #include "SimpleDownsample.h" diff --git a/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp b/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp index ac64680b31..19c27087c7 100644 --- a/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp +++ b/Gems/Microphone/Code/Source/Platform/None/MicrophoneSystemComponent_None.cpp @@ -5,7 +5,6 @@ * */ -#include "Microphone_precompiled.h" #include namespace Audio diff --git a/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp b/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp index 2b72c58b76..e0dec84ac7 100644 --- a/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp +++ b/Gems/Microphone/Code/Source/Platform/Windows/MicrophoneSystemComponent_Windows.cpp @@ -5,8 +5,6 @@ * */ -#include "Microphone_precompiled.h" - #include "MicrophoneSystemComponent.h" #include @@ -101,7 +99,11 @@ namespace Audio } PropVariantClear(&endpointName); - SAFE_RELEASE(m_deviceProps); + if (m_deviceProps) + { + m_deviceProps->Release(); + m_deviceProps = nullptr; + } } return true; @@ -115,8 +117,16 @@ namespace Audio // Assert: m_audioClient and m_audioCaptureClient are both nullptr! (i.e. the capture thread is not running) AZ_Assert(!m_audioClient && !m_audioCaptureClient, "ShutdownDevice - Audio Client pointers are not null! You need to call EndSession first!\n"); - SAFE_RELEASE(m_device); - SAFE_RELEASE(m_enumerator); + if (m_device) + { + m_device->Release(); + m_device = nullptr; + } + if (m_enumerator) + { + m_enumerator->Release(); + m_enumerator = nullptr; + } CoUninitialize(); } @@ -317,8 +327,16 @@ namespace Audio } } - SAFE_RELEASE(m_audioCaptureClient); - SAFE_RELEASE(m_audioClient); + if (m_audioCaptureClient) + { + m_audioCaptureClient->Release(); + m_audioCaptureClient = nullptr; + } + if (m_audioClient) + { + m_audioClient->Release(); + m_audioClient = nullptr; + } CoTaskMemFree(m_streamFormat); m_streamFormat = nullptr; diff --git a/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm b/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm index 3601ff3c4b..55af31c6d6 100644 --- a/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm +++ b/Gems/Microphone/Code/Source/Platform/iOS/MicrophoneSystemComponent_iOS.mm @@ -5,8 +5,6 @@ * */ -#include "Microphone_precompiled.h" - #import #import diff --git a/Gems/Microphone/Code/Source/SimpleDownsample.cpp b/Gems/Microphone/Code/Source/SimpleDownsample.cpp index 854451b830..15e6778e72 100644 --- a/Gems/Microphone/Code/Source/SimpleDownsample.cpp +++ b/Gems/Microphone/Code/Source/SimpleDownsample.cpp @@ -5,19 +5,17 @@ * */ -#include "Microphone_precompiled.h" - #include "SimpleDownsample.h" #include -AZStd::size_t GetDownsampleSize(AZStd::size_t sourceSize, AZ::u32 sourceSampleRate, AZ::u32 targetSampleRate) +size_t GetDownsampleSize(size_t sourceSize, AZ::u32 sourceSampleRate, AZ::u32 targetSampleRate) { - return (AZStd::size_t)round((float)sourceSize / ((float)sourceSampleRate / (float)targetSampleRate)); + return (size_t)round((float)sourceSize / ((float)sourceSampleRate / (float)targetSampleRate)); } -void Downsample(AZ::s16* inBuffer, AZStd::size_t inBufferSize, AZ::u32 inBufferSampleRate, - AZ::s16* outBuffer, AZStd::size_t outBufferSize, AZ::u32 outBufferSampleRate) +void Downsample(AZ::s16* inBuffer, size_t inBufferSize, AZ::u32 inBufferSampleRate, + AZ::s16* outBuffer, size_t outBufferSize, AZ::u32 outBufferSampleRate) { if(inBufferSampleRate == outBufferSampleRate) { @@ -31,14 +29,14 @@ void Downsample(AZ::s16* inBuffer, AZStd::size_t inBufferSize, AZ::u32 inBufferS } float sampleRateRatio = (float)inBufferSampleRate / (float)outBufferSampleRate; - AZStd::size_t offsetResult = 0; - AZStd::size_t offsetBuffer = 0; + size_t offsetResult = 0; + size_t offsetBuffer = 0; while(offsetResult < outBufferSize) { - AZStd::size_t nextOffsetBuffer = static_cast(round((float)(offsetResult + 1) * sampleRateRatio)); + size_t nextOffsetBuffer = static_cast(round((float)(offsetResult + 1) * sampleRateRatio)); AZ::s32 accum = 0; // this must be int 32 so it doesn't overflow with multiple int 16's possibly at max - AZStd::size_t count = 0; - for(AZStd::size_t i = offsetBuffer; i < nextOffsetBuffer && i < inBufferSize; ++i) + size_t count = 0; + for(size_t i = offsetBuffer; i < nextOffsetBuffer && i < inBufferSize; ++i) { accum += inBuffer[i]; count++; diff --git a/Gems/Microphone/Code/Source/SimpleDownsample.h b/Gems/Microphone/Code/Source/SimpleDownsample.h index abc87f191a..4a782975ee 100644 --- a/Gems/Microphone/Code/Source/SimpleDownsample.h +++ b/Gems/Microphone/Code/Source/SimpleDownsample.h @@ -5,11 +5,12 @@ * */ +#include // determine the new buffer size for downsampling -AZStd::size_t GetDownsampleSize(AZStd::size_t sourceSize, AZ::u32 sourceSampleRate, AZ::u32 targetSampleRate); +size_t GetDownsampleSize(size_t sourceSize, AZ::u32 sourceSampleRate, AZ::u32 targetSampleRate); // down sample a 16 bit audio buffer from on sample rate frequency to another lower sample rate frequency // outBuffer must already be allocated and large enough to hold the downsampled result -void Downsample(AZ::s16* inBuffer, AZStd::size_t inBufferSize, AZ::u32 inBufferSampleRate, - AZ::s16* outBuffer, AZStd::size_t outBufferSize, AZ::u32 outBufferSampleRate); +void Downsample(AZ::s16* inBuffer, size_t inBufferSize, AZ::u32 inBufferSampleRate, + AZ::s16* outBuffer, size_t outBufferSize, AZ::u32 outBufferSampleRate); diff --git a/Gems/Microphone/Code/microphone_files.cmake b/Gems/Microphone/Code/microphone_files.cmake index 233ce8eb91..6ebb8223ae 100644 --- a/Gems/Microphone/Code/microphone_files.cmake +++ b/Gems/Microphone/Code/microphone_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/Microphone_precompiled.h Source/MicrophoneSystemComponent.cpp Source/MicrophoneSystemComponent.h Source/SimpleDownsample.cpp From 1c6c9e0dd8c58747611cf5b0a7ade09dbc5d7926 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:02:35 -0700 Subject: [PATCH 039/300] ScriptEvents Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Builder/ScriptEventsBuilderComponent.cpp | 1 - .../Builder/ScriptEventsBuilderWorker.cpp | 2 -- .../ScriptEventReferencesComponent.cpp | 1 - .../DefaultEventHandler.cpp | 2 -- .../ScriptEventBinding.cpp | 2 -- .../ScriptEventBroadcast.cpp | 2 -- .../ScriptEventMethod.cpp | 2 -- .../Internal/VersionedProperty.cpp | 1 - .../Code/Include/ScriptEvents/ScriptEvent.cpp | 2 -- .../ScriptEvents/ScriptEventDefinition.cpp | 1 - .../ScriptEvents/ScriptEventRegistration.cpp | 2 -- .../ScriptEvents/ScriptEventSystem.cpp | 1 - .../ScriptEvents/ScriptEventsAsset.cpp | 2 -- .../Source/Editor/ScriptEventsEditorGem.cpp | 2 -- .../ScriptEventsSystemEditorComponent.cpp | 2 -- .../Code/Source/ScriptEventsGem.cpp | 1 - .../Source/ScriptEventsSystemComponent.cpp | 1 - Gems/ScriptEvents/Code/Source/precompiled.h | 11 ------- .../Code/Tests/Editor/EditorTests.cpp | 32 ------------------- .../Code/Tests/ScriptEventTestUtilities.cpp | 1 - .../Code/Tests/ScriptEventsTest.cpp | 2 -- .../Code/Tests/ScriptEventsTestFixture.cpp | 1 - .../Tests/Tests/ScriptEventsTest_Core.cpp | 2 -- .../Code/scriptevents_editor_files.cmake | 1 - .../Code/scriptevents_files.cmake | 1 - 25 files changed, 78 deletions(-) delete mode 100644 Gems/ScriptEvents/Code/Source/precompiled.h delete mode 100644 Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp diff --git a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp index bf4e9ad3d1..8b83f7b124 100644 --- a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp +++ b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderComponent.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp index 2357fb38a5..e81100ff20 100644 --- a/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp +++ b/Gems/ScriptEvents/Code/Builder/ScriptEventsBuilderWorker.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include #include diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp index 79d9fdd3c5..48bcfdc9fc 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Components/ScriptEventReferencesComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "ScriptEventReferencesComponent.h" namespace ScriptEvents diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp index 3896372564..a0d0281096 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/DefaultEventHandler.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "DefaultEventHandler.h" #include #include diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp index 3d78a481e5..233c9c05e4 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBinding.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "DefaultEventHandler.h" #include #include diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp index 06b42f4966..744e5bae72 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventBroadcast.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "ScriptEventBroadcast.h" #include "ScriptEventsBindingBus.h" diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp index 5caf4bbb91..189ea4d59f 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/BehaviorContextBinding/ScriptEventMethod.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "ScriptEventMethod.h" #include "ScriptEventsBindingBus.h" diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp index aaaa500123..eabc0ba902 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/Internal/VersionedProperty.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "VersionedProperty.h" #include diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp index c35737aaca..7a4efb7b01 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEvent.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "ScriptEvent.h" #include "ScriptEventRegistration.h" diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp index 75f3056124..c97820d1dc 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventDefinition.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "ScriptEventDefinition.h" #include "ScriptEventsBus.h" diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp index 13944ade9f..aaad062636 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventRegistration.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "ScriptEventRegistration.h" #include "ScriptEvent.h" #include "ScriptEventsBus.h" diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp index c88def3484..5dc1d49350 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventSystem.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "ScriptEventSystem.h" #include "ScriptEventDefinition.h" #include "ScriptEventsAsset.h" diff --git a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp index 673d694f2c..74d1b07964 100644 --- a/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp +++ b/Gems/ScriptEvents/Code/Include/ScriptEvents/ScriptEventsAsset.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "ScriptEventsAsset.h" #include "ScriptEventDefinition.h" #include "ScriptEventsBus.h" diff --git a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp index b9ff71caae..f36b5c99a8 100644 --- a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp +++ b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsEditorGem.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include #include diff --git a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp index bc71146bfa..db03abc4c9 100644 --- a/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp +++ b/Gems/ScriptEvents/Code/Source/Editor/ScriptEventsSystemEditorComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include "ScriptEventsSystemEditorComponent.h" #include diff --git a/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp index 936867f4ff..9bda1bcdc0 100644 --- a/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp +++ b/Gems/ScriptEvents/Code/Source/ScriptEventsGem.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "ScriptEventsSystemComponent.h" diff --git a/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp b/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp index 110de7e4ef..9f2e4a4781 100644 --- a/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp +++ b/Gems/ScriptEvents/Code/Source/ScriptEventsSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "ScriptEventsSystemComponent.h" #include diff --git a/Gems/ScriptEvents/Code/Source/precompiled.h b/Gems/ScriptEvents/Code/Source/precompiled.h deleted file mode 100644 index 3dec2dda4a..0000000000 --- a/Gems/ScriptEvents/Code/Source/precompiled.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include diff --git a/Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp b/Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp deleted file mode 100644 index c87383e224..0000000000 --- a/Gems/ScriptEvents/Code/Tests/Editor/EditorTests.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include "precompiled.h" -#include - -class ScriptEventsEditorTests - : public ::testing::Test -{ -protected: - void SetUp() override - { - - } - - void TearDown() override - { - - } -}; - -// Provide a stub test so that AssetProcessorBatch.exe can run Editor Test builds safely. -TEST_F(ScriptEventsEditorTests, StubTest) -{ - ASSERT_TRUE(true); -} - -AZ_UNIT_TEST_HOOK(); diff --git a/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp b/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp index 63ce7ee2e8..ac447f48e7 100644 --- a/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp +++ b/Gems/ScriptEvents/Code/Tests/ScriptEventTestUtilities.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "ScriptEventTestUtilities.h" #include #include diff --git a/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp b/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp index cba1fd92ed..aa1e2fea28 100644 --- a/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp +++ b/Gems/ScriptEvents/Code/Tests/ScriptEventsTest.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include AZ_UNIT_TEST_HOOK(DEFAULT_UNIT_TEST_ENV); diff --git a/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp index e9fce056c3..2a407bcbe1 100644 --- a/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp +++ b/Gems/ScriptEvents/Code/Tests/ScriptEventsTestFixture.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "ScriptEventsTestFixture.h" #include "ScriptEventsTestApplication.h" diff --git a/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp b/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp index 0e985729c3..1fdd0ac592 100644 --- a/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp +++ b/Gems/ScriptEvents/Code/Tests/Tests/ScriptEventsTest_Core.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include #include diff --git a/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake b/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake index 73eab21ecb..a2587085bf 100644 --- a/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake +++ b/Gems/ScriptEvents/Code/scriptevents_editor_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/precompiled.h Source/Editor/ScriptEventsEditorGem.cpp Source/Editor/ScriptEventsSystemEditorComponent.cpp Source/Editor/ScriptEventsSystemEditorComponent.h diff --git a/Gems/ScriptEvents/Code/scriptevents_files.cmake b/Gems/ScriptEvents/Code/scriptevents_files.cmake index 18df26eae4..29f1f0e501 100644 --- a/Gems/ScriptEvents/Code/scriptevents_files.cmake +++ b/Gems/ScriptEvents/Code/scriptevents_files.cmake @@ -6,6 +6,5 @@ # set(FILES - Source/precompiled.h Source/ScriptEventsGem.cpp ) From 6fa3d5c01e0da57b9b65736d7d0809895dea573e Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:03:54 -0700 Subject: [PATCH 040/300] SliceFavorites Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/ComponentSliceFavoritesWindow.cpp | 2 -- Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp | 2 -- .../Code/Source/SliceFavoritesModule.cpp | 2 -- .../Code/Source/SliceFavoritesSystemComponent.cpp | 2 -- .../Code/Source/SliceFavoritesTreeView.cpp | 1 - .../Code/Source/SliceFavoritesTreeView.h | 1 + .../Code/Source/SliceFavoritesWidget.cpp | 1 - .../Code/Source/SliceFavorites_precompiled.h | 10 ---------- Gems/SliceFavorites/Code/slicefavorites_files.cmake | 1 - 9 files changed, 1 insertion(+), 21 deletions(-) delete mode 100644 Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h diff --git a/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp b/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp index 84149dde4f..b9488e67c3 100644 --- a/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp +++ b/Gems/SliceFavorites/Code/Source/ComponentSliceFavoritesWindow.cpp @@ -5,8 +5,6 @@ * */ -#include "SliceFavorites_precompiled.h" - #include "ComponentSliceFavoritesWindow.h" #include "SliceFavoritesWidget.h" #include "SliceFavoritesSystemComponentBus.h" diff --git a/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp b/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp index 8d7886b45b..14c89c499d 100644 --- a/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp +++ b/Gems/SliceFavorites/Code/Source/FavoriteDataModel.cpp @@ -5,8 +5,6 @@ * */ -#include "SliceFavorites_precompiled.h" - #include "FavoriteDataModel.h" #include "ComponentSliceFavoritesWindow.h" diff --git a/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp index d56e01635a..e63a50fd66 100644 --- a/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp +++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesModule.cpp @@ -5,8 +5,6 @@ * */ -#include "SliceFavorites_precompiled.h" - #include #include "SliceFavoritesSystemComponent.h" diff --git a/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp index 7e624789d7..8fc4cc7a75 100644 --- a/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp +++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "SliceFavorites_precompiled.h" - #include "SliceFavoritesSystemComponent.h" #include "FavoriteDataModel.h" diff --git a/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp index 8319f60816..881d10290d 100644 --- a/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp +++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "SliceFavorites_precompiled.h" #include "SliceFavoritesTreeView.h" #include "FavoriteDataModel.h" diff --git a/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h index ec0fb82152..1534123e38 100644 --- a/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h +++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesTreeView.h @@ -11,6 +11,7 @@ #if !defined(Q_MOC_RUN) #include #include +#include #include #endif diff --git a/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp b/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp index 17526d8e5d..2eac252fd5 100644 --- a/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp +++ b/Gems/SliceFavorites/Code/Source/SliceFavoritesWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "SliceFavorites_precompiled.h" #include "SliceFavoritesWidget.h" #include "FavoriteDataModel.h" diff --git a/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h b/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h deleted file mode 100644 index eefa26c318..0000000000 --- a/Gems/SliceFavorites/Code/Source/SliceFavorites_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/SliceFavorites/Code/slicefavorites_files.cmake b/Gems/SliceFavorites/Code/slicefavorites_files.cmake index 492050a5f4..881b31d070 100644 --- a/Gems/SliceFavorites/Code/slicefavorites_files.cmake +++ b/Gems/SliceFavorites/Code/slicefavorites_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/SliceFavorites_precompiled.h Include/SliceFavorites/SliceFavoritesBus.h Source/SliceFavoritesSystemComponent.cpp Source/SliceFavoritesSystemComponent.h From b09dcc86d5b4189f58f133963bb8f07bfa850931 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:04:17 -0700 Subject: [PATCH 041/300] ScriptedEntityTweener Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/ScriptedEntityTweenerModule.cpp | 2 -- .../Code/Source/ScriptedEntityTweenerSubtask.cpp | 1 - .../Code/Source/ScriptedEntityTweenerSystemComponent.cpp | 2 -- .../Code/Source/ScriptedEntityTweenerTask.cpp | 1 - .../Code/Source/ScriptedEntityTweener_precompiled.h | 8 -------- .../Code/scriptedentitytweener_files.cmake | 1 - 6 files changed, 15 deletions(-) delete mode 100644 Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h diff --git a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp index d157fc2d75..ffb6cc6838 100644 --- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp +++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerModule.cpp @@ -5,8 +5,6 @@ * */ -#include "ScriptedEntityTweener_precompiled.h" - #include #include diff --git a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp index 490c09d495..81bead2bb5 100644 --- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp +++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSubtask.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "ScriptedEntityTweener_precompiled.h" #include diff --git a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp index 9cbfe72e8f..0a864d48e8 100644 --- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp +++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "ScriptedEntityTweener_precompiled.h" - #include #include #include diff --git a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp index 71048d87fa..97b5dd8610 100644 --- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp +++ b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweenerTask.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "ScriptedEntityTweener_precompiled.h" #include diff --git a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h b/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h deleted file mode 100644 index cc8a920d01..0000000000 --- a/Gems/ScriptedEntityTweener/Code/Source/ScriptedEntityTweener_precompiled.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once diff --git a/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake index 6926ca4a0d..0dda8ca080 100644 --- a/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake +++ b/Gems/ScriptedEntityTweener/Code/scriptedentitytweener_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/ScriptedEntityTweener_precompiled.h Include/ScriptedEntityTweener/ScriptedEntityTweenerBus.h Include/ScriptedEntityTweener/ScriptedEntityTweenerEnums.h Source/ScriptedEntityTweenerMath.h From 73de4bc922db5090c3f831d9747822d150da51b0 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:04:42 -0700 Subject: [PATCH 042/300] StartingPointCamera Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp | 2 +- .../Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp | 2 +- .../CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp | 2 +- .../Source/CameraTargetAcquirers/AcquireByEntityId.cpp | 2 +- .../Code/Source/CameraTargetAcquirers/AcquireByTag.cpp | 2 +- .../Code/Source/CameraTransformBehaviors/FaceTarget.cpp | 2 +- .../CameraTransformBehaviors/FollowTargetFromAngle.cpp | 2 +- .../FollowTargetFromDistance.cpp | 2 +- .../CameraTransformBehaviors/OffsetCameraPosition.cpp | 2 +- .../Code/Source/CameraTransformBehaviors/Rotate.cpp | 2 +- .../Code/Source/StartingPointCameraGem.cpp | 2 -- .../Code/Source/StartingPointCamera_precompiled.h | 9 --------- .../Code/startingpointcamera_files.cmake | 1 - 13 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp index d89608b930..07413246bf 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/OffsetPosition.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "OffsetPosition.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp index e8cf24988a..4540df9842 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/RotateCameraLookAt.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "RotateCameraLookAt.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp index e2e7cd0637..3a8a64f0d8 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraLookAtBehaviors/SlideAlongAxisBasedOnAngle.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "SlideAlongAxisBasedOnAngle.h" #include "StartingPointCamera/StartingPointCameraUtilities.h" #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp index 0314d9af05..e0669c0e84 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByEntityId.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "AcquireByEntityId.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp index 644b1accc5..9248a2c810 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraTargetAcquirers/AcquireByTag.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "AcquireByTag.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp index bc060231b9..a24866ca05 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FaceTarget.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "FaceTarget.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp index d6b2c95106..3cd29be679 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromAngle.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "FollowTargetFromAngle.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp index 50030b3086..931b8bf685 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/FollowTargetFromDistance.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "FollowTargetFromDistance.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp index 6ed1bbae73..7811d55475 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/OffsetCameraPosition.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "OffsetCameraPosition.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp index fe69c1410f..ed3a2133d6 100644 --- a/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp +++ b/Gems/StartingPointCamera/Code/Source/CameraTransformBehaviors/Rotate.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointCamera_precompiled.h" + #include "Rotate.h" #include #include diff --git a/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp b/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp index c4bb3cad27..688eb4336b 100644 --- a/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp +++ b/Gems/StartingPointCamera/Code/Source/StartingPointCameraGem.cpp @@ -5,8 +5,6 @@ * */ -#include "StartingPointCamera_precompiled.h" - #include "CameraTargetAcquirers/AcquireByEntityId.h" #include "CameraTargetAcquirers/AcquireByTag.h" #include "CameraTransformBehaviors/FollowTargetFromDistance.h" diff --git a/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h b/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h deleted file mode 100644 index 2609e3b701..0000000000 --- a/Gems/StartingPointCamera/Code/Source/StartingPointCamera_precompiled.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - diff --git a/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake b/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake index aa11d3ef54..770166e3c4 100644 --- a/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake +++ b/Gems/StartingPointCamera/Code/startingpointcamera_files.cmake @@ -29,5 +29,4 @@ set(FILES Source/CameraTransformBehaviors/OffsetCameraPosition.cpp Source/CameraTransformBehaviors/Rotate.h Source/CameraTransformBehaviors/Rotate.cpp - Source/StartingPointCamera_precompiled.h ) From 83a5ba2b16c11647cb1ca5572dd02e89a8a49cda Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:05:05 -0700 Subject: [PATCH 043/300] StartingPointInput Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/StartingPointInput/Code/Source/Input.cpp | 2 +- .../Code/Source/InputConfigurationComponent.cpp | 2 +- Gems/StartingPointInput/Code/Source/InputEventMap.cpp | 2 +- .../Code/Source/InputHandlerNodeable.cpp | 2 +- Gems/StartingPointInput/Code/Source/InputLibrary.cpp | 2 +- .../Code/Source/StartingPointInputGem.cpp | 2 -- .../Code/Source/StartingPointInput_precompiled.h | 8 -------- .../Code/Tests/StartingPointInputTest.cpp | 1 - .../Code/startingpointinput_editor_files.cmake | 1 - .../Code/startingpointinput_files.cmake | 1 - 10 files changed, 5 insertions(+), 18 deletions(-) delete mode 100644 Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h diff --git a/Gems/StartingPointInput/Code/Source/Input.cpp b/Gems/StartingPointInput/Code/Source/Input.cpp index 6ac711e88f..4933b65fa7 100644 --- a/Gems/StartingPointInput/Code/Source/Input.cpp +++ b/Gems/StartingPointInput/Code/Source/Input.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointInput_precompiled.h" + #include "Input.h" #include "LyToAzInputNameConversions.h" #include diff --git a/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp index 2d78cc828c..7a0b888f86 100644 --- a/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp +++ b/Gems/StartingPointInput/Code/Source/InputConfigurationComponent.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointInput_precompiled.h" + #include "InputConfigurationComponent.h" #include #include diff --git a/Gems/StartingPointInput/Code/Source/InputEventMap.cpp b/Gems/StartingPointInput/Code/Source/InputEventMap.cpp index aec1526250..c25d17879e 100644 --- a/Gems/StartingPointInput/Code/Source/InputEventMap.cpp +++ b/Gems/StartingPointInput/Code/Source/InputEventMap.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointInput_precompiled.h" + #include "InputEventMap.h" #include #include diff --git a/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp index d98daba121..3300a7d570 100644 --- a/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp +++ b/Gems/StartingPointInput/Code/Source/InputHandlerNodeable.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include + #include #include diff --git a/Gems/StartingPointInput/Code/Source/InputLibrary.cpp b/Gems/StartingPointInput/Code/Source/InputLibrary.cpp index 23d09b1b30..fc7a0b5a0d 100644 --- a/Gems/StartingPointInput/Code/Source/InputLibrary.cpp +++ b/Gems/StartingPointInput/Code/Source/InputLibrary.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include + #include #include diff --git a/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp b/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp index 6cc8eb33d7..17cd74c35a 100644 --- a/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp +++ b/Gems/StartingPointInput/Code/Source/StartingPointInputGem.cpp @@ -5,8 +5,6 @@ * */ -#include "StartingPointInput_precompiled.h" - #include "InputConfigurationComponent.h" #include "InputEventBindings.h" #include "InputEventMap.h" diff --git a/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h b/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h deleted file mode 100644 index cc8a920d01..0000000000 --- a/Gems/StartingPointInput/Code/Source/StartingPointInput_precompiled.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once diff --git a/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp b/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp index a366f757e3..c48a6e25f0 100644 --- a/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp +++ b/Gems/StartingPointInput/Code/Tests/StartingPointInputTest.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "StartingPointInput_precompiled.h" #include #include diff --git a/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake index 4a42575140..95a0ce04ed 100644 --- a/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake +++ b/Gems/StartingPointInput/Code/startingpointinput_editor_files.cmake @@ -19,5 +19,4 @@ set(FILES Source/InputNode.h Source/InputNode.cpp Source/StartingPointInputGem.cpp - Source/StartingPointInput_precompiled.h ) diff --git a/Gems/StartingPointInput/Code/startingpointinput_files.cmake b/Gems/StartingPointInput/Code/startingpointinput_files.cmake index 000c361b5b..e66aad9013 100644 --- a/Gems/StartingPointInput/Code/startingpointinput_files.cmake +++ b/Gems/StartingPointInput/Code/startingpointinput_files.cmake @@ -21,5 +21,4 @@ set(FILES Source/InputHandlerNodeable.cpp Source/InputHandlerNodeable.ScriptCanvasNodeable.xml Source/InputNode.ScriptCanvasGrammar.xml - Source/StartingPointInput_precompiled.h ) From 6a61dada4cb4551e4f2661809d49fa1bb1ce8c99 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:05:27 -0700 Subject: [PATCH 044/300] StartingPointMovement Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/StartingPointMovementGem.cpp | 2 -- .../Code/Source/StartingPointMovement_precompiled.h | 8 -------- .../Code/startingpointmovement_shared_files.cmake | 1 - 3 files changed, 11 deletions(-) delete mode 100644 Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h diff --git a/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp b/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp index 057a32c514..d48162ef96 100644 --- a/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp +++ b/Gems/StartingPointMovement/Code/Source/StartingPointMovementGem.cpp @@ -5,8 +5,6 @@ * */ -#include "StartingPointMovement_precompiled.h" - #include #include diff --git a/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h b/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h deleted file mode 100644 index cc8a920d01..0000000000 --- a/Gems/StartingPointMovement/Code/Source/StartingPointMovement_precompiled.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once diff --git a/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake b/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake index f2addd54fa..eaef289c6e 100644 --- a/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake +++ b/Gems/StartingPointMovement/Code/startingpointmovement_shared_files.cmake @@ -9,5 +9,4 @@ set(FILES Source/StartingPointMovementGem.cpp Include/StartingPointMovement/StartingPointMovementConstants.h Include/StartingPointMovement/StartingPointMovementUtilities.h - Source/StartingPointMovement_precompiled.h ) From 5ba12a29d1b59f388d551252974f29deaa7f1b6f Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:05:55 -0700 Subject: [PATCH 045/300] TickBusOrderView Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/TickBusOrderViewerModule.cpp | 1 - .../Code/Source/TickBusOrderViewerSystemComponent.cpp | 1 - .../Code/Source/TickBusOrderViewer_precompiled.h | 9 --------- .../Code/tickbusorderviewer_files.cmake | 1 - 4 files changed, 12 deletions(-) delete mode 100644 Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h diff --git a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp index 6d131241ea..bebbb32aaa 100644 --- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp +++ b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerModule.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "TickBusOrderViewer_precompiled.h" #include diff --git a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp index 80dbb2b579..76c6bfa63c 100644 --- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp +++ b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewerSystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "TickBusOrderViewer_precompiled.h" #include #include diff --git a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h b/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h deleted file mode 100644 index d424689241..0000000000 --- a/Gems/TickBusOrderViewer/Code/Source/TickBusOrderViewer_precompiled.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake index 682dbb506c..f033695ce1 100644 --- a/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake +++ b/Gems/TickBusOrderViewer/Code/tickbusorderviewer_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/TickBusOrderViewer_precompiled.h Include/TickBusOrderViewer/TickBusOrderViewerBus.h Source/TickBusOrderViewerSystemComponent.cpp Source/TickBusOrderViewerSystemComponent.h From d3d02059ccb8335f4f864f07ce6c8211446021ce Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:06:14 -0700 Subject: [PATCH 046/300] TextureAtlas Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp | 1 - Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp | 2 -- .../Code/Source/TextureAtlasSystemComponent.cpp | 8 +++++--- .../Code/Source/TextureAtlas_precompiled.h | 10 ---------- Gems/TextureAtlas/Code/textureatlas_files.cmake | 1 - 5 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h diff --git a/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp b/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp index 28210715a5..e03fea9521 100644 --- a/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp +++ b/Gems/TextureAtlas/Code/Source/TextureAtlasImpl.cpp @@ -5,7 +5,6 @@ * */ -#include "TextureAtlas_precompiled.h" #include "TextureAtlasImpl.h" #include diff --git a/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp b/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp index 71097fdfe0..c1c80541bc 100644 --- a/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp +++ b/Gems/TextureAtlas/Code/Source/TextureAtlasModule.cpp @@ -5,8 +5,6 @@ * */ -#include "TextureAtlas_precompiled.h" - #include #include "TextureAtlasSystemComponent.h" diff --git a/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp b/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp index 3d30370faa..be392ba66d 100644 --- a/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp +++ b/Gems/TextureAtlas/Code/Source/TextureAtlasSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "TextureAtlas_precompiled.h" - #include #include #include @@ -239,7 +237,11 @@ namespace TextureAtlasNamespace temp.m_atlas->GetTexture().reset(); } // Delete the atlas - SAFE_DELETE(temp.m_atlas); + if (temp.m_atlas) + { + delete temp.m_atlas; + temp.m_atlas = NULL; + } } return; } diff --git a/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h b/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h deleted file mode 100644 index eefa26c318..0000000000 --- a/Gems/TextureAtlas/Code/Source/TextureAtlas_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/TextureAtlas/Code/textureatlas_files.cmake b/Gems/TextureAtlas/Code/textureatlas_files.cmake index 44d2443072..66db415a36 100644 --- a/Gems/TextureAtlas/Code/textureatlas_files.cmake +++ b/Gems/TextureAtlas/Code/textureatlas_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/TextureAtlas_precompiled.h Include/TextureAtlas/TextureAtlasBus.h Include/TextureAtlas/TextureAtlasNotificationBus.h Include/TextureAtlas/TextureAtlas.h From 98c46cdf8d1eca2a7efc9f90ce76f7eb5b9d6399 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:06:34 -0700 Subject: [PATCH 047/300] Twitch Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/Twitch/Code/Source/ComponentStub.cpp | 2 -- Gems/Twitch/Code/Source/TwitchModule.cpp | 1 - Gems/Twitch/Code/Source/TwitchREST.cpp | 1 - Gems/Twitch/Code/Source/TwitchReflection.cpp | 1 - Gems/Twitch/Code/Source/TwitchSystemComponent.cpp | 2 -- Gems/Twitch/Code/Source/Twitch_precompiled.h | 7 ------- Gems/Twitch/Code/lmbraws_unsupported_files.cmake | 1 - Gems/Twitch/Code/twitch_files.cmake | 1 - 8 files changed, 16 deletions(-) delete mode 100644 Gems/Twitch/Code/Source/Twitch_precompiled.h diff --git a/Gems/Twitch/Code/Source/ComponentStub.cpp b/Gems/Twitch/Code/Source/ComponentStub.cpp index f65d127212..cf2be12c3f 100644 --- a/Gems/Twitch/Code/Source/ComponentStub.cpp +++ b/Gems/Twitch/Code/Source/ComponentStub.cpp @@ -5,8 +5,6 @@ * */ -#include "Twitch_precompiled.h" - #include AZ_DECLARE_MODULE_CLASS(Gem_Twitch, AZ::Module) diff --git a/Gems/Twitch/Code/Source/TwitchModule.cpp b/Gems/Twitch/Code/Source/TwitchModule.cpp index 9819c93e7c..9ec7ad5a2f 100644 --- a/Gems/Twitch/Code/Source/TwitchModule.cpp +++ b/Gems/Twitch/Code/Source/TwitchModule.cpp @@ -5,7 +5,6 @@ * */ -#include "Twitch_precompiled.h" #include #include diff --git a/Gems/Twitch/Code/Source/TwitchREST.cpp b/Gems/Twitch/Code/Source/TwitchREST.cpp index d4d42347aa..e6cc90c9df 100644 --- a/Gems/Twitch/Code/Source/TwitchREST.cpp +++ b/Gems/Twitch/Code/Source/TwitchREST.cpp @@ -5,7 +5,6 @@ * */ -#include "Twitch_precompiled.h" #include #include #include diff --git a/Gems/Twitch/Code/Source/TwitchReflection.cpp b/Gems/Twitch/Code/Source/TwitchReflection.cpp index 50d4079d7a..1d353a8d72 100644 --- a/Gems/Twitch/Code/Source/TwitchReflection.cpp +++ b/Gems/Twitch/Code/Source/TwitchReflection.cpp @@ -5,7 +5,6 @@ * */ -#include "Twitch_precompiled.h" #include #include #include diff --git a/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp index c163d39370..4624f5da42 100644 --- a/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp +++ b/Gems/Twitch/Code/Source/TwitchSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "Twitch_precompiled.h" - #include #include #include diff --git a/Gems/Twitch/Code/Source/Twitch_precompiled.h b/Gems/Twitch/Code/Source/Twitch_precompiled.h deleted file mode 100644 index e41e011a88..0000000000 --- a/Gems/Twitch/Code/Source/Twitch_precompiled.h +++ /dev/null @@ -1,7 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once diff --git a/Gems/Twitch/Code/lmbraws_unsupported_files.cmake b/Gems/Twitch/Code/lmbraws_unsupported_files.cmake index 0c76fe2cd3..6b02631077 100644 --- a/Gems/Twitch/Code/lmbraws_unsupported_files.cmake +++ b/Gems/Twitch/Code/lmbraws_unsupported_files.cmake @@ -6,6 +6,5 @@ # set(FILES - Source/Twitch_precompiled.h Source/ComponentStub.cpp ) diff --git a/Gems/Twitch/Code/twitch_files.cmake b/Gems/Twitch/Code/twitch_files.cmake index 6ae60b7923..5367b5096f 100644 --- a/Gems/Twitch/Code/twitch_files.cmake +++ b/Gems/Twitch/Code/twitch_files.cmake @@ -10,7 +10,6 @@ set(FILES Include/Twitch/TwitchTypes.h Include/Twitch/BaseTypes.h Include/Twitch/RESTTypes.h - Source/Twitch_precompiled.h Source/TwitchSystemComponent.cpp Source/TwitchSystemComponent.h Source/TwitchReflection.cpp From b95ec16e71a3066d8396ccc770ee5d8bf89235bc Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:06:51 -0700 Subject: [PATCH 048/300] VirtualGamepad Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/InputDeviceVirtualGamepad.cpp | 2 -- .../Code/Source/VirtualGamepadButtonComponent.cpp | 2 -- Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp | 2 -- .../Code/Source/VirtualGamepadSystemComponent.cpp | 2 -- .../Code/Source/VirtualGamepadThumbStickComponent.cpp | 2 -- .../Code/Source/VirtualGamepad_precompiled.h | 8 -------- Gems/VirtualGamepad/Code/virtualgamepad_files.cmake | 1 - 7 files changed, 19 deletions(-) delete mode 100644 Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h diff --git a/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp b/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp index e9d71aa23e..b7ffa2bab2 100644 --- a/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp +++ b/Gems/VirtualGamepad/Code/Source/InputDeviceVirtualGamepad.cpp @@ -5,8 +5,6 @@ * */ -#include "VirtualGamepad_precompiled.h" - #include "InputDeviceVirtualGamepad.h" #include "VirtualGamepadButtonRequestBus.h" diff --git a/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp index 269545e8d8..c450774843 100644 --- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp +++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadButtonComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "VirtualGamepad_precompiled.h" - #include "VirtualGamepadButtonComponent.h" #include diff --git a/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp index c781b102e6..4d397ca1ae 100644 --- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp +++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadModule.cpp @@ -5,8 +5,6 @@ * */ -#include "VirtualGamepad_precompiled.h" - #include #include "VirtualGamepadButtonComponent.h" diff --git a/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp index fd0d42ab3f..e605891d79 100644 --- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp +++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "VirtualGamepad_precompiled.h" - #include "VirtualGamepadSystemComponent.h" #include "InputDeviceVirtualGamepad.h" diff --git a/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp index bc1964ff5d..6a203bfa2e 100644 --- a/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp +++ b/Gems/VirtualGamepad/Code/Source/VirtualGamepadThumbStickComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "VirtualGamepad_precompiled.h" - #include "VirtualGamepadThumbStickComponent.h" #include diff --git a/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h b/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h deleted file mode 100644 index cc8a920d01..0000000000 --- a/Gems/VirtualGamepad/Code/Source/VirtualGamepad_precompiled.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once diff --git a/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake b/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake index 09cc357a1c..a8e3738f35 100644 --- a/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake +++ b/Gems/VirtualGamepad/Code/virtualgamepad_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/VirtualGamepad_precompiled.h Include/VirtualGamepad/VirtualGamepadBus.h Source/InputDeviceVirtualGamepad.cpp Source/InputDeviceVirtualGamepad.h From e92d9f6823809d6e0a776ee45c8847d54dda1dd0 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:07:15 -0700 Subject: [PATCH 049/300] SurfaceData Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Include/SurfaceData/Tests/SurfaceDataTestMocks.h | 4 ++-- .../Source/Components/SurfaceDataColliderComponent.cpp | 1 - .../Code/Source/Components/SurfaceDataShapeComponent.cpp | 1 - .../Source/Editor/EditorSurfaceDataColliderComponent.cpp | 1 - .../Source/Editor/EditorSurfaceDataShapeComponent.cpp | 1 - .../Source/Editor/EditorSurfaceDataSystemComponent.cpp | 1 - .../Code/Source/Editor/EditorSurfaceTagListAsset.cpp | 1 - Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp | 1 - Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h | 1 - Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp | 2 -- Gems/SurfaceData/Code/Source/SurfaceDataModule.h | 1 - .../Code/Source/SurfaceDataSystemComponent.cpp | 2 -- Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp | 2 +- Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h | 9 --------- Gems/SurfaceData/Code/Source/SurfaceTag.cpp | 1 - .../Code/Source/TerrainSurfaceDataSystemComponent.cpp | 2 +- .../Code/Tests/SurfaceDataColliderComponentTest.cpp | 2 +- Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp | 1 - Gems/SurfaceData/Code/surfacedata_files.cmake | 1 - 19 files changed, 5 insertions(+), 30 deletions(-) delete mode 100644 Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h diff --git a/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h b/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h index 8fc22fd988..ebf89be0b1 100644 --- a/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h +++ b/Gems/SurfaceData/Code/Include/SurfaceData/Tests/SurfaceDataTestMocks.h @@ -271,7 +271,7 @@ namespace UnitTest { // We don't actually remove the entry from our list because we use handles as indices, so the indices can't change. // Clearing out the entity Id should be good enough. - uint32 index = static_cast(handle) - 1; + uint32_t index = static_cast(handle) - 1; if (index < entryList.size()) { entryList[index].m_entityId = AZ::EntityId(); @@ -281,7 +281,7 @@ namespace UnitTest void UpdateEntry(const SurfaceData::SurfaceDataRegistryHandle& handle, const SurfaceData::SurfaceDataRegistryEntry& entry, AZStd::vector& entryList) { - uint32 index = static_cast(handle) - 1; + uint32_t index = static_cast(handle) - 1; if (index < entryList.size()) { entryList[index] = entry; diff --git a/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp index 098e71f9ac..0fa84cae6e 100644 --- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp +++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataColliderComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include "SurfaceDataColliderComponent.h" #include diff --git a/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp index ea33b8d1a2..bab05044bb 100644 --- a/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp +++ b/Gems/SurfaceData/Code/Source/Components/SurfaceDataShapeComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include "SurfaceDataShapeComponent.h" #include diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp index 45532486af..e1986f008c 100644 --- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp +++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataColliderComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include "EditorSurfaceDataColliderComponent.h" #include #include diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp index 4422f22e62..ce74705453 100644 --- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp +++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataShapeComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include "EditorSurfaceDataShapeComponent.h" #include #include diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp index ab1b0cdffe..9da2540126 100644 --- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp +++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceDataSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include "EditorSurfaceDataSystemComponent.h" #include #include diff --git a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp index bd127990d4..f6b1ad7a3c 100644 --- a/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp +++ b/Gems/SurfaceData/Code/Source/Editor/EditorSurfaceTagListAsset.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include "EditorSurfaceTagListAsset.h" #include #include diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp index fc3b91be5a..039989bbc4 100644 --- a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp +++ b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include #include #include diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h index 4d5d1fb05f..8bf9cc2ee3 100644 --- a/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h +++ b/Gems/SurfaceData/Code/Source/SurfaceDataEditorModule.h @@ -7,7 +7,6 @@ #pragma once -#include "SurfaceData_precompiled.h" #include namespace SurfaceData diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp index ae2b66a8f6..3c9b5734f2 100644 --- a/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp +++ b/Gems/SurfaceData/Code/Source/SurfaceDataModule.cpp @@ -5,8 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" - #include #include #include diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataModule.h b/Gems/SurfaceData/Code/Source/SurfaceDataModule.h index afd5ad1b52..d3f1e4632a 100644 --- a/Gems/SurfaceData/Code/Source/SurfaceDataModule.h +++ b/Gems/SurfaceData/Code/Source/SurfaceDataModule.h @@ -7,7 +7,6 @@ #pragma once -#include "SurfaceData_precompiled.h" #include namespace SurfaceData diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp index a3e6d65eef..9c5d47d44b 100644 --- a/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp +++ b/Gems/SurfaceData/Code/Source/SurfaceDataSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" - #include #include #include diff --git a/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp b/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp index 24e59bd2c2..8f3b0c3b8b 100644 --- a/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp +++ b/Gems/SurfaceData/Code/Source/SurfaceDataUtility.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "SurfaceData_precompiled.h" + #include #include diff --git a/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h b/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h deleted file mode 100644 index d424689241..0000000000 --- a/Gems/SurfaceData/Code/Source/SurfaceData_precompiled.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/SurfaceData/Code/Source/SurfaceTag.cpp b/Gems/SurfaceData/Code/Source/SurfaceTag.cpp index 692e7185bb..b54ca4a4a9 100644 --- a/Gems/SurfaceData/Code/Source/SurfaceTag.cpp +++ b/Gems/SurfaceData/Code/Source/SurfaceTag.cpp @@ -5,7 +5,6 @@ * */ -#include "SurfaceData_precompiled.h" #include #include diff --git a/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp index 01b9467363..e5eb4a5f6a 100644 --- a/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp +++ b/Gems/SurfaceData/Code/Source/TerrainSurfaceDataSystemComponent.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "SurfaceData_precompiled.h" + #include "TerrainSurfaceDataSystemComponent.h" #include #include diff --git a/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp index ecb3c9cfa6..154d329a05 100644 --- a/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp +++ b/Gems/SurfaceData/Code/Tests/SurfaceDataColliderComponentTest.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "SurfaceData_precompiled.h" + #include #include diff --git a/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp index cffdf0ea3f..d6b335bd6e 100644 --- a/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp +++ b/Gems/SurfaceData/Code/Tests/SurfaceDataTest.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "SurfaceData_precompiled.h" #include #include diff --git a/Gems/SurfaceData/Code/surfacedata_files.cmake b/Gems/SurfaceData/Code/surfacedata_files.cmake index cfeec51b41..0560c3f81a 100644 --- a/Gems/SurfaceData/Code/surfacedata_files.cmake +++ b/Gems/SurfaceData/Code/surfacedata_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/SurfaceData_precompiled.h Include/SurfaceData/SurfaceDataConstants.h Include/SurfaceData/SurfaceDataTypes.h Include/SurfaceData/SurfaceDataSystemRequestBus.h From 0f3b9646013809b84e021812c50ec2c503917512 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:08:04 -0700 Subject: [PATCH 050/300] ScriptCanvasPhysics Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/PhysicsNodeLibrary.cpp | 2 -- .../Code/Source/ScriptCanvasPhysicsModule.cpp | 2 -- .../Code/Source/ScriptCanvasPhysicsSystemComponent.cpp | 2 -- .../Code/Source/ScriptCanvasPhysics_precompiled.h | 10 ---------- .../Code/Tests/ScriptCanvasPhysicsTest.cpp | 2 -- .../Code/scriptcanvas_physics_files.cmake | 1 - .../Code/scriptcanvas_physics_shared_files.cmake | 1 - 7 files changed, 20 deletions(-) delete mode 100644 Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h diff --git a/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp b/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp index 7864ad97b4..215ea536c8 100644 --- a/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp +++ b/Gems/ScriptCanvasPhysics/Code/Source/PhysicsNodeLibrary.cpp @@ -5,8 +5,6 @@ * */ -#include "ScriptCanvasPhysics_precompiled.h" - #include "PhysicsNodeLibrary.h" #include "WorldNodes.h" diff --git a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp index 94a28fb3a8..2371c8c27d 100644 --- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp +++ b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsModule.cpp @@ -5,8 +5,6 @@ * */ -#include "ScriptCanvasPhysics_precompiled.h" - #include #include "ScriptCanvasPhysicsSystemComponent.h" diff --git a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp index dd76ae0925..06b4b4541d 100644 --- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp +++ b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysicsSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "ScriptCanvasPhysics_precompiled.h" - #include #include #include diff --git a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h b/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h deleted file mode 100644 index eefa26c318..0000000000 --- a/Gems/ScriptCanvasPhysics/Code/Source/ScriptCanvasPhysics_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp b/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp index 6bc7b5fd42..f8f4914eb4 100644 --- a/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp +++ b/Gems/ScriptCanvasPhysics/Code/Tests/ScriptCanvasPhysicsTest.cpp @@ -5,8 +5,6 @@ * */ -#include "ScriptCanvasPhysics_precompiled.h" - #include #include #include diff --git a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake index 04d5da2c30..8fca977c53 100644 --- a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake +++ b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/ScriptCanvasPhysics_precompiled.h Source/PhysicsNodeLibrary.cpp Source/PhysicsNodeLibrary.h Source/ScriptCanvasPhysicsSystemComponent.cpp diff --git a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake index ca64d4d804..f8b5773b3a 100644 --- a/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake +++ b/Gems/ScriptCanvasPhysics/Code/scriptcanvas_physics_shared_files.cmake @@ -6,6 +6,5 @@ # set(FILES - Source/ScriptCanvasPhysics_precompiled.h Source/ScriptCanvasPhysicsModule.cpp ) From 472867a4112d9a67d73db861d766d69173f73e3b Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:12:47 -0700 Subject: [PATCH 051/300] GraphCanvas Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Components/BookmarkAnchor/BookmarkAnchorComponent.cpp | 1 - .../BookmarkAnchor/BookmarkAnchorVisualComponent.cpp | 1 - .../Code/Source/Components/BookmarkManagerComponent.cpp | 1 - .../Source/Components/Connections/ConnectionComponent.cpp | 1 - .../Source/Components/Connections/ConnectionComponent.h | 2 ++ .../Connections/ConnectionLayerControllerComponent.cpp | 1 - .../Components/Connections/ConnectionVisualComponent.cpp | 1 - .../Components/Connections/ConnectionVisualComponent.h | 2 ++ .../DataConnections/DataConnectionComponent.cpp | 1 - .../DataConnections/DataConnectionGraphicsItem.cpp | 1 - .../DataConnections/DataConnectionVisualComponent.cpp | 1 - .../Code/Source/Components/GeometryComponent.cpp | 1 - Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp | 1 - .../Code/Source/Components/GridVisualComponent.cpp | 1 - .../Code/Source/Components/LayerControllerComponent.cpp | 1 - .../NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp | 1 - .../NodePropertyDisplays/BooleanNodePropertyDisplay.cpp | 1 - .../NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp | 1 - .../NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp | 1 - .../NodePropertyDisplays/NumericNodePropertyDisplay.cpp | 1 - .../NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp | 1 - .../NodePropertyDisplays/StringNodePropertyDisplay.cpp | 1 - .../VariableReferenceNodePropertyDisplay.cpp | 1 - .../NodePropertyDisplays/VectorNodePropertyDisplay.cpp | 1 - .../Nodes/Comment/CommentLayerControllerComponent.cpp | 1 - .../Nodes/Comment/CommentNodeFrameComponent.cpp | 1 - .../Nodes/Comment/CommentNodeLayoutComponent.cpp | 1 - .../Components/Nodes/Comment/CommentNodeTextComponent.cpp | 3 +-- .../Nodes/Comment/CommentTextGraphicsWidget.cpp | 3 +-- .../Components/Nodes/Comment/CommentTextGraphicsWidget.h | 2 ++ .../Nodes/General/GeneralNodeFrameComponent.cpp | 3 ++- .../Components/Nodes/General/GeneralNodeFrameComponent.h | 2 ++ .../Nodes/General/GeneralNodeLayoutComponent.cpp | 1 - .../Nodes/General/GeneralNodeTitleComponent.cpp | 1 - .../Nodes/General/GeneralSlotLayoutComponent.cpp | 1 - .../Nodes/Group/CollapsedNodeGroupComponent.cpp | 1 - .../Components/Nodes/Group/NodeGroupFrameComponent.cpp | 1 - .../Components/Nodes/Group/NodeGroupLayoutComponent.cpp | 1 - .../Code/Source/Components/Nodes/NodeComponent.cpp | 1 - .../Source/Components/Nodes/NodeFrameGraphicsWidget.cpp | 1 - .../Source/Components/Nodes/NodeFrameGraphicsWidget.h | 2 ++ .../Nodes/Wrapper/WrapperNodeLayoutComponent.cpp | 1 - .../Code/Source/Components/PersistentIdComponent.cpp | 1 - .../GraphCanvas/Code/Source/Components/SceneComponent.cpp | 1 - .../Code/Source/Components/SceneMemberComponent.cpp | 1 - .../Source/Components/Slots/Data/DataSlotComponent.cpp | 1 - .../Components/Slots/Data/DataSlotConnectionPin.cpp | 1 - .../Components/Slots/Data/DataSlotLayoutComponent.cpp | 1 - .../Slots/Default/DefaultSlotLayoutComponent.cpp | 1 - .../Components/Slots/Execution/ExecutionSlotComponent.cpp | 1 - .../Slots/Execution/ExecutionSlotConnectionPin.cpp | 1 - .../Slots/Execution/ExecutionSlotLayoutComponent.cpp | 1 - .../Components/Slots/Extender/ExtenderSlotComponent.cpp | 1 - .../Slots/Extender/ExtenderSlotConnectionPin.cpp | 1 - .../Slots/Extender/ExtenderSlotLayoutComponent.cpp | 1 - .../Components/Slots/Property/PropertySlotComponent.cpp | 1 - .../Slots/Property/PropertySlotLayoutComponent.cpp | 1 - .../Code/Source/Components/Slots/SlotComponent.cpp | 1 - .../Components/Slots/SlotConnectionFilterComponent.cpp | 1 - .../Code/Source/Components/Slots/SlotConnectionPin.cpp | 1 - .../Code/Source/Components/Slots/SlotLayoutComponent.cpp | 1 - .../Code/Source/Components/StylingComponent.cpp | 1 - Gems/GraphCanvas/Code/Source/GraphCanvas.cpp | 2 +- Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp | 2 +- Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp | 1 - Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp | 1 - .../Code/Source/Widgets/GraphCanvasCheckBox.cpp | 1 - .../Code/Source/Widgets/GraphCanvasComboBox.cpp | 3 ++- .../GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h | 2 ++ Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp | 1 - .../Code/Source/Widgets/NodePropertyDisplayWidget.cpp | 1 - Gems/GraphCanvas/Code/Source/tools.cpp | 1 - .../NodePropertyDisplay/NodePropertyDisplay.cpp | 3 ++- .../GraphCanvas/Components/Slots/Data/DataSlotBus.h | 2 ++ .../Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp | 1 - Gems/GraphCanvas/Code/graphcanvas_files.cmake | 1 - Gems/GraphCanvas/Code/precompiled.h | 8 -------- 77 files changed, 24 insertions(+), 79 deletions(-) delete mode 100644 Gems/GraphCanvas/Code/precompiled.h diff --git a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp index 6ddb60e0c1..16a4fa9d5e 100644 --- a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp index 525654423d..acf878889c 100644 --- a/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkAnchor/BookmarkAnchorVisualComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp index cfb180288d..31e7eec4ab 100644 --- a/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/BookmarkManagerComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp index 07cb535336..069029f669 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h index 7147128d03..a987b3b6fc 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionComponent.h @@ -6,6 +6,8 @@ */ #pragma once +#include + AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp index a6cdae36d7..fcdb2a6d95 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionLayerControllerComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp index da426b294f..82d9441ef3 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h index 053b4544be..8c0bb81190 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/ConnectionVisualComponent.h @@ -6,6 +6,8 @@ */ #pragma once +#include + AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp index b570137780..c0815841de 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp index eec2e7dbf7..e2e6fab7ef 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionGraphicsItem.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp index 2a7ba62f55..193308cb62 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Connections/DataConnections/DataConnectionVisualComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp index 0deb608731..61fd049758 100644 --- a/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/GeometryComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp index c960c43118..82a8828d3d 100644 --- a/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/GridComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp index b6edd70547..227d0d760f 100644 --- a/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/GridVisualComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp index ec4f7069ae..ea1a323016 100644 --- a/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/LayerControllerComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp index 73e44586ff..d139b620bc 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/AssetIdNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp index 8839b6516b..b291cac3f5 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/BooleanNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp index b1869d310f..c538b6dca3 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ComboBoxNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp index f835fb897f..af527f8094 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/EntityIdNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp index abd27849f4..61cab518c8 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/NumericNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp index aacaea8892..092f48e5c9 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/ReadOnlyNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp index 8f14f7d72e..17d6e367cd 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/StringNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp index e1081871f9..198126a1cd 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VariableReferenceNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp index 9407e6b71e..d4a77e8e0f 100644 --- a/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/NodePropertyDisplays/VectorNodePropertyDisplay.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp index d0cc78a7fa..9e195521ce 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentLayerControllerComponent.cpp @@ -4,6 +4,5 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp index 7a6b1799c2..21a44ea28c 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeFrameComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp index 7e0e6adbe3..d1fde8c07f 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp index d41ca43a00..5ee4ee10ee 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentNodeTextComponent.cpp @@ -4,9 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" -#include +#include AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp index e1411101d5..feeaf324cd 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.cpp @@ -4,9 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" -#include +#include AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h index f298220d41..58b1e6ca28 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Comment/CommentTextGraphicsWidget.h @@ -6,6 +6,8 @@ */ #pragma once +#include + AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #if !defined(Q_MOC_RUN) #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp index e291afe5e6..0ab8deaccf 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" + +#include AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h index b1c15457f2..e26abb5f98 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeFrameComponent.h @@ -6,6 +6,8 @@ */ #pragma once +#include + AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #include AZ_POP_DISABLE_WARNING diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp index 598ceea26f..24e8c59a0a 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp index 4f5b2b96f7..a268378917 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralNodeTitleComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp index bb4d06bdc2..ee467e4cfb 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/General/GeneralSlotLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp index 3b29a0c525..dc88bcf5cd 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/CollapsedNodeGroupComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp index af52fae065..0c2df8dd06 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupFrameComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp index 1e8a130cb5..b8452699b1 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Group/NodeGroupLayoutComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp index 03af347555..c17803ffcd 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp index 46917e41ca..969b15bc2b 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h index 07ae7b45b1..f1dfdaf7f2 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/NodeFrameGraphicsWidget.h @@ -6,6 +6,8 @@ */ #pragma once +#include + AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") #include AZ_POP_DISABLE_WARNING diff --git a/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp index 3ff15f891f..c5dd700ce0 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Nodes/Wrapper/WrapperNodeLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp index af8b590ef5..fe4e639911 100644 --- a/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/PersistentIdComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp index 559d8a0b57..db2629a242 100644 --- a/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/SceneComponent.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp index 76630d503b..c0fe10b8ed 100644 --- a/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/SceneMemberComponent.cpp @@ -5,7 +5,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp index e05ed2c033..bdc9dbbb56 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp index de7e4e7fa1..b9178fe8c7 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotConnectionPin.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp index 415f51f9d2..0f87af3b56 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Data/DataSlotLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp index ac678b9303..2368000dee 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Default/DefaultSlotLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp index c1785790d4..440018908d 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp index 14368662af..eee4871c9e 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotConnectionPin.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp index 5fd11dacf0..6b22525f10 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Execution/ExecutionSlotLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp index 6ed94c274e..45628165d2 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp index 374f4eb0aa..b940c3901e 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotConnectionPin.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp index 9664583e6f..5c2623c79f 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Extender/ExtenderSlotLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp index 9e6827a358..821d5a3640 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp index da08357bed..9c36f1f19c 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/Property/PropertySlotLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp index df92ce4a0e..93c54d6cc0 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp index 85a015c8a6..b04df3daa7 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionFilterComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp index cd903b09f1..135f6a8980 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotConnectionPin.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp index aa19ec11e2..09f12f6a38 100644 --- a/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/Slots/SlotLayoutComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp b/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp index cf5f89d4c5..9cb95e0b59 100644 --- a/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp +++ b/Gems/GraphCanvas/Code/Source/Components/StylingComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp index 011548ce5a..cc85e1066c 100644 --- a/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp +++ b/Gems/GraphCanvas/Code/Source/GraphCanvas.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include + #include #include diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp index 17f61b2d7b..653361f1b6 100644 --- a/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp +++ b/Gems/GraphCanvas/Code/Source/GraphCanvasEditorModule.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include + #include #include diff --git a/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp b/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp index 5cbf440762..bb241e9662 100644 --- a/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp +++ b/Gems/GraphCanvas/Code/Source/GraphCanvasGameModule.cpp @@ -5,7 +5,6 @@ * */ -#include #include namespace GraphCanvas diff --git a/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp b/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp index b1d034d033..c0348a3a0f 100644 --- a/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp +++ b/Gems/GraphCanvas/Code/Source/Tests/GraphCanvasTest.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include class GraphCanvasTest diff --git a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp index 524021464d..6795d81a2f 100644 --- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp +++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasCheckBox.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp index c5752aa6b4..f18b784582 100644 --- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp +++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" + +#include AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #include diff --git a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h index 07318d7535..4524ce3697 100644 --- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h +++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasComboBox.h @@ -6,6 +6,8 @@ */ #pragma once +#include + AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") #if !defined(Q_MOC_RUN) #include diff --git a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp index e35d4720d9..d8b9d4163a 100644 --- a/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp +++ b/Gems/GraphCanvas/Code/Source/Widgets/GraphCanvasLabel.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp b/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp index 9281a6709d..646c97e6e5 100644 --- a/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp +++ b/Gems/GraphCanvas/Code/Source/Widgets/NodePropertyDisplayWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/Source/tools.cpp b/Gems/GraphCanvas/Code/Source/tools.cpp index ee17d6fab0..3200c97380 100644 --- a/Gems/GraphCanvas/Code/Source/tools.cpp +++ b/Gems/GraphCanvas/Code/Source/tools.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp index 258e4a2c5c..d2fe37accc 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/NodePropertyDisplay/NodePropertyDisplay.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" + +#include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") #include diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h index 060e3d7d3a..3e6859292e 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Components/Slots/Data/DataSlotBus.h @@ -6,6 +6,8 @@ */ #pragma once +#include + AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #include AZ_POP_DISABLE_WARNING diff --git a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp index 258992e3d0..e2d4f19c0b 100644 --- a/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp +++ b/Gems/GraphCanvas/Code/StaticLib/GraphCanvas/Utils/GraphUtils.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/GraphCanvas/Code/graphcanvas_files.cmake b/Gems/GraphCanvas/Code/graphcanvas_files.cmake index 73efe3eaee..93e7388adb 100644 --- a/Gems/GraphCanvas/Code/graphcanvas_files.cmake +++ b/Gems/GraphCanvas/Code/graphcanvas_files.cmake @@ -6,7 +6,6 @@ # set(FILES - precompiled.h Include/GraphCanvas/Widgets/RootGraphicsItem.h Include/GraphCanvas/tools.h Include/GraphCanvas/Components/Connections/ConnectionFilters/ConnectionFilterBus.h diff --git a/Gems/GraphCanvas/Code/precompiled.h b/Gems/GraphCanvas/Code/precompiled.h deleted file mode 100644 index f1184278c9..0000000000 --- a/Gems/GraphCanvas/Code/precompiled.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#include From ffb235e45819379d89b0c01d15d507f5d03652fd Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:17:30 -0700 Subject: [PATCH 052/300] ScriptCanvas Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Asset/EditorAssetSystemComponent.cpp | 1 - .../Builder/ScriptCanvasBuilderWorker.cpp | 1 - .../ScriptCanvasBuilderWorkerUtility.cpp | 1 - .../Code/Editor/Assets/ScriptCanvasAsset.cpp | 1 - .../Assets/ScriptCanvasAssetHandler.cpp | 1 - .../Editor/Assets/ScriptCanvasAssetHolder.cpp | 1 - .../Assets/ScriptCanvasAssetTracker.cpp | 1 - .../Editor/Assets/ScriptCanvasMemoryAsset.cpp | 1 - .../Code/Editor/Components/EditorGraph.cpp | 2 +- .../EditorGraphVariableManagerComponent.cpp | 1 - .../EditorScriptCanvasComponent.cpp | 1 - .../Code/Editor/Components/EditorUtils.cpp | 1 - .../Code/Editor/Components/GraphUpgrade.cpp | 1 - .../Code/Editor/Components/IconComponent.cpp | 1 - .../DynamicOrderingDynamicSlotComponent.cpp | 1 - .../Components/DynamicSlotComponent.cpp | 1 - .../Components/MappingComponent.cpp | 1 - .../ClassMethodNodeDescriptorComponent.cpp | 1 - ...BusHandlerEventNodeDescriptorComponent.cpp | 1 - .../EBusHandlerNodeDescriptorComponent.cpp | 1 - .../EBusSenderNodeDescriptorComponent.cpp | 1 - .../FunctionNodeDescriptorComponent.cpp | 1 - .../GetVariableNodeDescriptorComponent.cpp | 1 - .../NodeDescriptorComponent.cpp | 1 - .../NodelingDescriptorComponent.cpp | 1 - ...ntReceiverEventNodeDescriptorComponent.cpp | 1 - ...ptEventReceiverNodeDescriptorComponent.cpp | 1 - ...riptEventSenderNodeDescriptorComponent.cpp | 1 - .../SetVariableNodeDescriptorComponent.cpp | 1 - .../UserDefinedNodeDescriptorComponent.cpp | 1 - .../VariableNodeDescriptorComponent.cpp | 1 - .../Editor/Model/EntityMimeDataHandler.cpp | 1 - .../Code/Editor/Model/LibraryDataModel.cpp | 1 - .../Model/UnitTestBrowserFilterModel.cpp | 2 -- .../Code/Editor/ReflectComponent.cpp | 1 - .../Code/Editor/ScriptCanvasEditorGem.cpp | 1 - Gems/ScriptCanvas/Code/Editor/Settings.cpp | 1 - .../Code/Editor/SystemComponent.cpp | 1 - .../Editor/Undo/ScriptCanvasGraphCommand.cpp | 1 - .../Editor/Undo/ScriptCanvasUndoManager.cpp | 2 -- .../Code/Editor/Utilities/Command.cpp | 1 - .../CommonSettingsConfigurations.cpp | 1 - .../Utilities/CommonSettingsConfigurations.h | 2 ++ .../Code/Editor/Utilities/RecentAssetPath.cpp | 1 - .../Code/Editor/Utilities/RecentAssetPath.h | 2 +- .../Code/Editor/Utilities/RecentFiles.cpp | 1 - .../ContainerWizard/ContainerTypeLineEdit.cpp | 1 - .../ContainerWizard/ContainerWizard.cpp | 1 - .../Editor/View/Dialogs/NewGraphDialog.cpp | 1 - .../Editor/View/Dialogs/SettingsDialog.cpp | 1 - .../View/Dialogs/UnsavedChangesDialog.cpp | 1 - .../Code/Editor/View/Widgets/CanvasWidget.cpp | 1 - .../Code/Editor/View/Widgets/CommandLine.cpp | 1 - .../Code/Editor/View/Widgets/CommandLine.h | 1 + .../DataTypePalette/DataTypePaletteModel.cpp | 1 - .../Code/Editor/View/Widgets/GraphTabBar.cpp | 1 - .../Code/Editor/View/Widgets/LogPanel.cpp | 1 - .../LoggingAssetDataAggregator.cpp | 1 - .../LoggingAssetWindowSession.cpp | 1 - .../LiveLoggingDataAggregator.cpp | 1 - .../LiveLoggingWindowSession.cpp | 1 - .../LoggingPanel/LoggingDataAggregator.cpp | 1 - .../Widgets/LoggingPanel/LoggingTypes.cpp | 1 - .../Widgets/LoggingPanel/LoggingWindow.cpp | 1 - .../LoggingPanel/LoggingWindowSession.cpp | 1 - .../LoggingPanel/LoggingWindowSession.h | 2 ++ .../LoggingPanel/LoggingWindowTreeItems.cpp | 1 - .../EntityPivotTree/EntityPivotTree.cpp | 1 - .../GraphPivotTree/GraphPivotTree.cpp | 1 - .../PivotTree/PivotTreeWidget.cpp | 1 - .../View/Widgets/MainWindowStatusWidget.cpp | 1 - .../NodePalette/CreateNodeMimeEvent.cpp | 1 - .../EBusNodePaletteTreeItemTypes.cpp | 1 - .../FunctionNodePaletteTreeItemTypes.cpp | 1 - .../GeneralNodePaletteTreeItemTypes.cpp | 1 - .../Widgets/NodePalette/NodePaletteModel.cpp | 1 - .../ScriptEventsNodePaletteTreeItemTypes.cpp | 1 - .../SpecializedNodePaletteTreeItemTypes.cpp | 1 - .../VariableNodePaletteTreeItemTypes.cpp | 1 - .../Code/Editor/View/Widgets/PropertyGrid.cpp | 1 - .../View/Widgets/PropertyGridContextMenu.cpp | 1 - .../ScriptCanvasNodePaletteDockWidget.cpp | 1 - .../StatisticsDialog/NodeUsageTreeItem.cpp | 1 - .../ScriptCanvasStatisticsDialog.cpp | 1 - .../UnitTestPanel/UnitTestDockWidget.cpp | 1 - .../UnitTestPanel/UnitTestTreeView.cpp | 2 -- .../GraphValidationDockWidget.cpp | 1 - .../VariablePanel/GraphVariablesTableView.cpp | 1 - .../VariablePanel/SlotTypeSelectorWidget.cpp | 1 - .../VariablePanel/VariableDockWidget.cpp | 1 - .../VariablePaletteTableView.cpp | 1 - .../View/Windows/CreateNodeContextMenu.cpp | 1 - .../View/Windows/EBusHandlerActionMenu.cpp | 1 - .../Code/Editor/View/Windows/MainWindow.cpp | 2 -- .../View/Windows/ScriptCanvasContextMenus.cpp | 1 - .../Tools/UpgradeTool/UpgradeHelper.cpp | 2 -- .../Windows/Tools/UpgradeTool/UpgradeTool.cpp | 2 -- .../Tools/UpgradeTool/VersionExplorer.cpp | 2 -- Gems/ScriptCanvas/Code/Editor/precompiled.h | 13 ---------- .../Contracts/StorageRequiredContract.cpp | 1 - .../Libraries/Entity/FindTaggedEntities.cpp | 1 - .../Libraries/Math/BinaryOperation.cpp | 1 - .../Include/ScriptCanvas/Profiler/Driller.cpp | 1 - .../Code/Source/ScriptCanvasGem.cpp | 1 - Gems/ScriptCanvas/Code/Source/precompiled.h | 25 ------------------- .../Code/Tests/ScriptCanvasBuilderTests.cpp | 1 - .../Code/Tests/ScriptCanvasUnitTestHook.cpp | 1 - ...ScriptCanvasUnitTest_AbstractCodeModel.cpp | 1 - ...iptCanvasUnitTest_BehaviorContextUtils.cpp | 1 - ...nitTest_EventHandlerTranslationUtility.cpp | 1 - .../Tests/ScriptCanvasUnitTest_Method.cpp | 1 - .../Code/Tests/ScriptCanvasUnitTest_Node.cpp | 1 - ...sUnitTest_ScriptCanvasBuilderComponent.cpp | 1 - .../Code/scriptcanvasgem_editor_files.cmake | 1 - .../scriptcanvasgem_editor_shared_files.cmake | 1 - .../Code/scriptcanvasgem_game_files.cmake | 1 - .../Code/scriptcanvasgem_tests_files.cmake | 1 - 117 files changed, 7 insertions(+), 157 deletions(-) delete mode 100644 Gems/ScriptCanvas/Code/Editor/precompiled.h delete mode 100644 Gems/ScriptCanvas/Code/Source/precompiled.h diff --git a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp index 2bc3a91a96..f6efc69106 100644 --- a/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp +++ b/Gems/ScriptCanvas/Code/Asset/EditorAssetSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp index b9d1dd5a7c..ff70262578 100644 --- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp +++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorker.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp index 7f6269a698..79369bf004 100644 --- a/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp +++ b/Gems/ScriptCanvas/Code/Builder/ScriptCanvasBuilderWorkerUtility.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp index 75bfefbd6e..27b10e36cd 100644 --- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAsset.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp index 5a15fe4298..79f29b302a 100644 --- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHandler.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp index 2f0d0bfc2c..101d8f1c5e 100644 --- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetHolder.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp index 24d9aa5ba7..34d43fd9da 100644 --- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasAssetTracker.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "ScriptCanvasAssetTracker.h" diff --git a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp index c973034fa1..4c95747f38 100644 --- a/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Assets/ScriptCanvasMemoryAsset.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "ScriptCanvasMemoryAsset.h" #include "ScriptCanvasUndoHelper.h" diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp index 8078ef7a78..0d4aa1edfa 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraph.cpp @@ -5,7 +5,7 @@ * */ -#include "precompiled.h" +#include AZ_PUSH_DISABLE_WARNING(4251 4800 4244, "-Wunknown-warning-option") #include diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp index 95dcca4d72..89ea045cd4 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorGraphVariableManagerComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp index 1e879c000a..4eb700fa7f 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorScriptCanvasComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp b/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp index 42f30e0a89..ca4415c401 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/EditorUtils.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp b/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp index fcffc49b74..2e467392f5 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/GraphUpgrade.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp index 511b3f6658..25fa9f8e4a 100644 --- a/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Components/IconComponent.cpp @@ -6,7 +6,6 @@ * */ -#include "precompiled.h" #include "IconComponent.h" diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp index c5f212abbc..9a26395e36 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicOrderingDynamicSlotComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp index bd845548c6..dbe9bb4893 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/DynamicSlotComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp index fd6313f243..4d6d6fa2fa 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/MappingComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp index ce8c4a7386..1c785d4de8 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ClassMethodNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp index 396f53309a..06c3d8ea14 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerEventNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp index 1c94d19137..2e226fe721 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusHandlerNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp index 03dfa6f73c..13892dd660 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/EBusSenderNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp index 3930c91841..56f2db7454 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/FunctionNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "FunctionNodeDescriptorComponent.h" diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp index 9599475a10..4d143158cd 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/GetVariableNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp index 86e0e930ce..b2d10ccb18 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp index d86f3991fd..37ed329892 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/NodelingDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "NodelingDescriptorComponent.h" #include "ScriptCanvas/Bus/EditorScriptCanvasBus.h" diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp index 6872bf7f55..506b0db235 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverEventNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp index 4832739422..1f3e927d49 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventReceiverNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp index 1c141f4825..2d19f779fb 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/ScriptEventSenderNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp index 6b608f0113..9acdf6d894 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/SetVariableNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp index ddaedc9039..f9ffe87831 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/UserDefinedNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp index a3db1ca2d6..0bb685c107 100644 --- a/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/GraphCanvas/Components/NodeDescriptors/VariableNodeDescriptorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp b/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp index aafb32eb81..0902ef84c3 100644 --- a/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Model/EntityMimeDataHandler.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "EntityMimeDataHandler.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp index dff8090522..b743162c82 100644 --- a/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Model/LibraryDataModel.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "LibraryDataModel.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp index 318201fc87..2684c66d22 100644 --- a/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Model/UnitTestBrowserFilterModel.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp index 435aa27331..2dfbb40522 100644 --- a/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/ReflectComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp b/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp index 588e1cf1d0..531bd4aeb4 100644 --- a/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp +++ b/Gems/ScriptCanvas/Code/Editor/ScriptCanvasEditorGem.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #if defined (SCRIPTCANVAS_EDITOR) diff --git a/Gems/ScriptCanvas/Code/Editor/Settings.cpp b/Gems/ScriptCanvas/Code/Editor/Settings.cpp index 821f0956d3..debd494f14 100644 --- a/Gems/ScriptCanvas/Code/Editor/Settings.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Settings.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp index a451787ede..ec70b00532 100644 --- a/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/SystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp index d745014d69..49427cac63 100644 --- a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasGraphCommand.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp index 4870b8728d..1a580ccaa5 100644 --- a/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Undo/ScriptCanvasUndoManager.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp index e55b62681d..a0181f6ac2 100644 --- a/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Utilities/Command.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "Command.h" namespace ScriptCanvasEditor diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp index f874246c93..b3a5d2c386 100644 --- a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "CommonSettingsConfigurations.h" diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h index 3d150d7c64..d40cd5c5b6 100644 --- a/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h +++ b/Gems/ScriptCanvas/Code/Editor/Utilities/CommonSettingsConfigurations.h @@ -10,6 +10,8 @@ #define SCRIPTCANVASEDITOR_AZ_QCOREAPPLICATION_SETTINGS_ORGANIZATION_NAME "O3DE" #define SCRIPTCANVASEDITOR_NAME_SHORT "ScriptCanvasEditor" +#include + namespace ScriptCanvasEditor { AZStd::string GetEditingGameDataFolder(); diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp index 83aeef56e2..fcb6c60664 100644 --- a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "RecentAssetPath.h" #include "CommonSettingsConfigurations.h" diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h index 8214da7473..402e8e6876 100644 --- a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h +++ b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentAssetPath.h @@ -6,7 +6,7 @@ */ #pragma once -#include +#include namespace ScriptCanvasEditor { diff --git a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp index dca0fbb17b..a113bc726d 100644 --- a/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp +++ b/Gems/ScriptCanvas/Code/Editor/Utilities/RecentFiles.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "RecentFiles.h" #include "CommonSettingsConfigurations.h" diff --git a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp index 7f99fd40dd..6bcb228013 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerTypeLineEdit.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp index f1afa83338..0191f3f9f3 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/ContainerWizard/ContainerWizard.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp index 4bdcd80fc3..d956b1c5e2 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/NewGraphDialog.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "NewGraphDialog.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp index b5b922acff..eb96fb6e16 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/SettingsDialog.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "SettingsDialog.h" // qtextformat.h(365): warning C4251: 'QTextFormat::d': class 'QSharedDataPointer' needs to have dll-interface to be used by clients of class 'QTextFormat' AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") diff --git a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp index 6e03b4d70c..426538d883 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Dialogs/UnsavedChangesDialog.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "UnsavedChangesDialog.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp index 7205a7bb85..1f585b5b29 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CanvasWidget.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "CanvasWidget.h" diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp index 7e1e443164..84ce61f34e 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "CommandLine.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h index dfe1d58101..6fd524582d 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/CommandLine.h @@ -15,6 +15,7 @@ #include #include +#include #include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp index 3aa4d34293..a8cafa0df9 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/DataTypePalette/DataTypePaletteModel.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp index 7e8bbec40c..bd72023f1d 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/GraphTabBar.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp index 9e7c48f949..4415369a03 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LogPanel.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "LogPanel.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp index df88efb67f..99c2cd89b7 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetDataAggregator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp index a452fc3f23..6441c53b64 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/AssetWindowSession/LoggingAssetWindowSession.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp index 25ab3ba941..8850f2910d 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingDataAggregator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp index 26a1ab88d3..2ab7fefbd3 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LiveWindowSession/LiveLoggingWindowSession.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp index ad5725295c..43eacef671 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingDataAggregator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp index 5dc360b7e2..21dcc384b3 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingTypes.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp index dc0316bd87..20890055a5 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindow.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp index 2e26101179..15f7fce5d5 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h index 1375151731..500df3f6b5 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowSession.h @@ -6,6 +6,8 @@ */ #pragma once +#include + // qbrush.h(118): warning C4251: 'QBrush::d': class 'QScopedPointer' needs to have dll-interface to be used by clients of class 'QBrush' // qwidget.h(858): warning C4800: 'uint': forcing value to bool 'true' or 'false' (performance warning) AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp index 5996a33b36..2bf5563e63 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/LoggingWindowTreeItems.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp index 3a6f7b3e69..33e4c2ca3a 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/EntityPivotTree/EntityPivotTree.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp index d754236b8d..c43f529e1e 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/GraphPivotTree/GraphPivotTree.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp index 07e9814aae..d9211fa18e 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/LoggingPanel/PivotTree/PivotTreeWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp index 77606488c1..333b933dfc 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/MainWindowStatusWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp index 7b3ffdc1f1..6126f4b10c 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/CreateNodeMimeEvent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp index 4b2e9ffe7d..6d05621114 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/EBusNodePaletteTreeItemTypes.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp index 9e5c027491..84fcd5e07f 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/FunctionNodePaletteTreeItemTypes.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp index 9d49f17fa5..f03cbc28c3 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/GeneralNodePaletteTreeItemTypes.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp index 0dada0f7aa..f901ceb75b 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/NodePaletteModel.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp index c339f941aa..b7e290ac21 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/ScriptEventsNodePaletteTreeItemTypes.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp index 0f97741060..e0dbec1eb6 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/SpecializedNodePaletteTreeItemTypes.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp index 054158bcde..1f79322432 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/NodePalette/VariableNodePaletteTreeItemTypes.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp index f25f6ba2bf..4d742ea654 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGrid.cpp @@ -5,7 +5,6 @@ * */ -#include #include "PropertyGrid.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp index 14aca1a0d8..6e0223636e 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/PropertyGridContextMenu.cpp @@ -5,7 +5,6 @@ * */ -#include #include "PropertyGrid.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp index 3afa9100d0..b9b34621df 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ScriptCanvasNodePaletteDockWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp index 4281e35250..d4524e2127 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/NodeUsageTreeItem.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp index 7aa03224e4..1531f7dcaa 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/StatisticsDialog/ScriptCanvasStatisticsDialog.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp index 85c70f7864..6e878dd065 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestDockWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp index b95354b7d8..2d62880d49 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/UnitTestPanel/UnitTestTreeView.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp index 4100103dd1..b82abfba4b 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/ValidationPanel/GraphValidationDockWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp index 95e782c137..d5046404cc 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/GraphVariablesTableView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp index f98c896f69..57b4711258 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/SlotTypeSelectorWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp index a6ae834f3e..5029af40e7 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariableDockWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp index 6622221c68..b0e24878a0 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Widgets/VariablePanel/VariablePaletteTableView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp index f5b77e4bd7..40b48ff4ca 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/CreateNodeContextMenu.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp index c64d6253c1..aa6059b998 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/EBusHandlerActionMenu.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp index 7c6c161246..e6ac1347b1 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/MainWindow.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp index 716c498b56..af5c5cc49b 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/ScriptCanvasContextMenus.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp index 382f2a6784..de69086a95 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeHelper.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp index c3ccd3105c..77f51bfbdd 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/UpgradeTool.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp index 4bee3ab351..154fc26c4c 100644 --- a/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp +++ b/Gems/ScriptCanvas/Code/Editor/View/Windows/Tools/UpgradeTool/VersionExplorer.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include #include diff --git a/Gems/ScriptCanvas/Code/Editor/precompiled.h b/Gems/ScriptCanvas/Code/Editor/precompiled.h deleted file mode 100644 index dafa822ce4..0000000000 --- a/Gems/ScriptCanvas/Code/Editor/precompiled.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include - -#include diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp index f0519cd7ed..468a2bbb94 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Core/Contracts/StorageRequiredContract.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include "StorageRequiredContract.h" #include diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp index 7682a412a8..465b8b6400 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Entity/FindTaggedEntities.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp index 19adcd2777..6acc75dccb 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Libraries/Math/BinaryOperation.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "BinaryOperation.h" diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp index f6812351d0..26170b1cc4 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Profiler/Driller.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp b/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp index c0bf635efc..debcf3de7a 100644 --- a/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp +++ b/Gems/ScriptCanvas/Code/Source/ScriptCanvasGem.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #if !defined(SCRIPTCANVAS_EDITOR) diff --git a/Gems/ScriptCanvas/Code/Source/precompiled.h b/Gems/ScriptCanvas/Code/Source/precompiled.h deleted file mode 100644 index 8e9334e7ef..0000000000 --- a/Gems/ScriptCanvas/Code/Source/precompiled.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include -#include - -#include - -#if defined(SCRIPTCANVAS_EDITOR) - -#include - -#else - -#include - -#endif // SCRIPTCANVAS_EDITOR - diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp index 0664e034e0..249a2f3fd3 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasBuilderTests.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp index d0384e7f23..3b53a334a7 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTestHook.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp index 8897218f7a..51df23f889 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_AbstractCodeModel.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp index ae5fc8582d..442a7ace25 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_BehaviorContextUtils.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp index 8d37b2889d..72107e8103 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_EventHandlerTranslationUtility.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp index 8cfdc43003..f789913f1c 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Method.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp index 97042a8c99..ad48d4fe65 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_Node.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp index 4fdb709e27..9aa79d21cd 100644 --- a/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp +++ b/Gems/ScriptCanvas/Code/Tests/ScriptCanvasUnitTest_ScriptCanvasBuilderComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake index 309fa83edc..59b9c0ae40 100644 --- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake +++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Editor/precompiled.h Editor/ScriptCanvasEditorGem.cpp Editor/Settings.h Editor/Settings.cpp diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake index 95430a69c8..6da3a67522 100644 --- a/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake +++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_editor_shared_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Editor/precompiled.h Editor/ScriptCanvasEditorGem.cpp Include/ScriptCanvas/ScriptCanvasGem.h ) diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake index 299209436f..95fab349b9 100644 --- a/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake +++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_game_files.cmake @@ -6,6 +6,5 @@ # set(FILES - Source/precompiled.h Source/ScriptCanvasGem.cpp ) diff --git a/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake b/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake index 7d20226e9c..81678aa1ec 100644 --- a/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake +++ b/Gems/ScriptCanvas/Code/scriptcanvasgem_tests_files.cmake @@ -6,6 +6,5 @@ # set(FILES - Source/precompiled.h Tests/ScriptCanvasTest.cpp ) From bd6db70a83acaaf4cc7a67ac718fb75de37e01c0 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:20:44 -0700 Subject: [PATCH 053/300] ScriptCanvasDeveloper Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../DeveloperUtils.h | 1 - .../EditorAutomation/EditorAutomationAction.h | 1 + .../EditorAutomation/EditorAutomationTest.h | 1 + .../DynamicSlotFullCreation.cpp | 1 - .../FullyConnectedNodePaletteCreation.cpp | 1 - .../NodePaletteFullCreation.cpp | 1 - .../VariableListFullCreation.cpp | 1 - .../Code/Editor/Source/Developer.cpp | 1 - .../Code/Editor/Source/DeveloperUtils.cpp | 1 - .../EditorKeyActions.cpp | 1 - .../EditorMouseActions.cpp | 1 - .../GenericActions.cpp | 1 - .../ScriptCanvasActions/ConnectionActions.cpp | 1 - .../CreateElementsActions.cpp | 1 - .../ScriptCanvasActions/EditorViewActions.cpp | 1 - .../ElementInteractions.cpp | 1 - .../ScriptCanvasActions/GraphActions.cpp | 1 - .../ScriptCanvasActions/VariableActions.cpp | 1 - .../EditorAutomationActions/WidgetActions.cpp | 1 - .../ConnectionStates.cpp | 1 - .../CreateElementsStates.cpp | 1 - .../EditorViewStates.cpp | 1 - .../ElementInteractionStates.cpp | 1 - .../EditorAutomationStates/GraphStates.cpp | 1 - .../EditorAutomationStates/UtilityStates.cpp | 1 - .../EditorAutomationStates/VariableStates.cpp | 1 - .../EditorAutomation/EditorAutomationTest.cpp | 1 - .../Source/EditorAutomationTestDialog.cpp | 1 - .../GraphCreationTests.cpp | 1 - .../EditorAutomationTests/GroupTests.cpp | 1 - .../InteractionTests.cpp | 1 - .../NodeCreationTests.cpp | 1 - .../EditorAutomationTests/VariableTests.cpp | 1 - .../Code/Editor/Source/Mock.cpp | 1 - .../Code/Editor/Source/NodeListDumpAction.cpp | 1 - .../ScriptCanvasDeveloperEditorComponent.cpp | 1 - .../Source/ScriptCanvasDeveloperGem.cpp | 1 - .../Code/Editor/Source/TSGenerateAction.cpp | 1 - .../Code/Editor/Source/WrapperMock.cpp | 1 - .../Code/Editor/Source/XMLDoc.cpp | 1 - .../Code/Editor/Source/XMLDoc.h | 2 ++ .../Game/Source/ScriptCanvasDeveloperGem.cpp | 2 -- .../Source/ScriptCanvasDeveloperComponent.cpp | 2 -- .../Code/Source/precompiled.h | 26 ------------------- .../Code/Tests/ScriptCanvasDeveloperTest.cpp | 1 - ...riptcanvasdeveloper_gem_common_files.cmake | 1 - 46 files changed, 4 insertions(+), 70 deletions(-) delete mode 100644 Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h index dbd7e116bd..ce3bcadaa5 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/DeveloperUtils.h @@ -6,7 +6,6 @@ */ #pragma once -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h index 4f62073df8..22793a39da 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationAction.h @@ -11,6 +11,7 @@ #include #include #include +#include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h index 30b13fca15..8ea13d9042 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Include/ScriptCanvasDeveloperEditor/EditorAutomation/EditorAutomationTest.h @@ -9,6 +9,7 @@ #include #include +#include #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp index ed4bd76aa9..3897c23e10 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/DynamicSlotFullCreation.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp index 3f400cfa96..8389fb8a72 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/FullyConnectedNodePaletteCreation.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp index 1dc843dcd4..c78ebe01b9 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/NodePaletteFullCreation.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp index 6f698d8af2..467968a99a 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/AutomationActions/VariableListFullCreation.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp index 29cef2b2c3..c2778e599b 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Developer.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp index b3a8b08549..86c3036fbc 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/DeveloperUtils.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp index cb3a356008..2d4bf087eb 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorKeyActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp index b5753c06c4..163a24a827 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/EditorMouseActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp index b341fe2ec4..5f21c1545b 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/GenericActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp index 302138491e..771d4d9156 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ConnectionActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp index 01997982f8..fa88c96d62 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/CreateElementsActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp index ed3cf05b5d..f24c850dd4 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/EditorViewActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp index 4db4d6c827..695b11a384 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/ElementInteractions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp index 777dcdd1b6..e2f7e84b47 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/GraphActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp index 451c8ada44..a25462ff29 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/ScriptCanvasActions/VariableActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp index 017dc8b950..b9a9c4d180 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationActions/WidgetActions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp index df46cf1b07..28e120f788 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ConnectionStates.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp index 16d0bc3707..c6b4189234 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/CreateElementsStates.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp index 86afe4564e..f0a78b852f 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/EditorViewStates.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp index d3ecfebddc..ba777b3ddf 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/ElementInteractionStates.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp index 3e24f04a0f..bd445ffcb9 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/GraphStates.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp index e7b4b829d3..81fe947ba6 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/UtilityStates.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp index a1d3513dde..4ee9edb37f 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationStates/VariableStates.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp index d3f7f07f3c..eb0d1f0a29 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomation/EditorAutomationTest.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp index 35c31f9f83..528482230d 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTestDialog.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp index cb182b1852..3cdd9feedf 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GraphCreationTests.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp index b1a41a94fc..6791eb43ef 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/GroupTests.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp index 8e69ade668..9cd8872ecd 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/InteractionTests.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp index a9aaaac591..aa36bab3d6 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/NodeCreationTests.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp index b1fa4849bf..27b40004eb 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/EditorAutomationTests/VariableTests.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp index 9ecbbc8995..417aa7c733 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/Mock.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp index 5a395a8732..4811116406 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/NodeListDumpAction.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp index 62ec2b0973..f135b5b569 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperEditorComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp index 7bebe48fdf..9a7bd99a0d 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/ScriptCanvasDeveloperGem.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp index 483778e94a..a45ee65f10 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/TSGenerateAction.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp index cb3d5fbdd9..ef8c3083e6 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/WrapperMock.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp index 047df73df1..d9430f44d7 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.cpp @@ -5,7 +5,6 @@ * */ -#include "precompiled.h" #include "XMLDoc.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h index b8c2d068f5..439323a9d5 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h +++ b/Gems/ScriptCanvasDeveloper/Code/Editor/Source/XMLDoc.h @@ -9,6 +9,8 @@ #include #include +#include +#include using namespace AZ::rapidxml; diff --git a/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp b/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp index 2b20b7766c..27b58de54a 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Game/Source/ScriptCanvasDeveloperGem.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp b/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp index a79521e42a..acc9fb645d 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Source/ScriptCanvasDeveloperComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "precompiled.h" - #include #include #include diff --git a/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h b/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h deleted file mode 100644 index 2968ab652a..0000000000 --- a/Gems/ScriptCanvasDeveloper/Code/Source/precompiled.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include -#include - -#include - - -#if defined(SCRIPTCANVASDEVELOPER_EDITOR) - -#include - -#else - -#include - -#endif // SCRIPTCANVAS_EDITOR - diff --git a/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp b/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp index ba7caec391..fc991e7e55 100644 --- a/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp +++ b/Gems/ScriptCanvasDeveloper/Code/Tests/ScriptCanvasDeveloperTest.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "precompiled.h" #include diff --git a/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake index abe33739a8..b21914ff42 100644 --- a/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake +++ b/Gems/ScriptCanvasDeveloper/Code/scriptcanvasdeveloper_gem_common_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/precompiled.h Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperGem.h Include/ScriptCanvasDeveloper/ScriptCanvasDeveloperComponent.h Source/ScriptCanvasDeveloperComponent.cpp From 4e84738ff25b60575a97824e0f71105d82cec253 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 12 Jul 2021 20:32:08 -0700 Subject: [PATCH 054/300] Ordering file alphabetically Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Tests/aztoolsframeworktests_files.cmake | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake index 573de25d42..9d1ec3e346 100644 --- a/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake +++ b/Code/Framework/AzToolsFramework/Tests/aztoolsframeworktests_files.cmake @@ -11,35 +11,37 @@ set(FILES AssetFileInfoListComparison.cpp AssetSeedManager.cpp AssetSystemMocks.h - ComponentModeTests.cpp - ComponentModeTestDoubles.h + ComponentAdapterTests.cpp + ComponentAddRemove.cpp ComponentModeTestDoubles.cpp - ComponentModeTestFixture.h + ComponentModeTestDoubles.h ComponentModeTestFixture.cpp + ComponentModeTestFixture.h + ComponentModeTests.cpp EditorTransformComponentSelectionTests.cpp EditorVertexSelectionTests.cpp + Entity/EditorEntityContextComponentTests.cpp + Entity/EditorEntityHelpersTests.cpp + Entity/EditorEntitySearchComponentTests.cpp + Entity/EditorEntitySelectionTests.cpp EntityIdQLabelTests.cpp EntityInspectorTests.cpp + EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp + EntityOwnershipService/EntityOwnershipServiceTestFixture.h + EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp + EntityOwnershipService/SliceEntityOwnershipTests.cpp + EntityTestbed.h + FileFunc.cpp FingerprintingTests.cpp + GenericComponentWrapperTest.cpp + InstanceDataHierarchy.cpp + IntegerPrimtitiveTestConfig.h LogLines.cpp ManipulatorBoundsTests.cpp ManipulatorCoreTests.cpp ManipulatorViewTests.cpp - PlatformAddressedAssetCatalogTests.cpp - PropertyIntCtrlCommonTests.h - IntegerPrimtitiveTestConfig.h - QtWidgetLimitsTests.cpp - PropertyIntSliderCtrlTests.cpp - PropertyIntSpinCtrlTests.cpp - PropertyTreeEditorTests.cpp - PythonBindingTests.cpp - Slice.cpp - SliceUpgradeTestsData.h - SliceUpgradeTests.cpp - SpinBoxTests.cpp - ThumbnailerTests.cpp - UndoStack.cpp PerforceComponentTests.cpp + PlatformAddressedAssetCatalogTests.cpp Prefab/Benchmark/PrefabBenchmarkFixture.cpp Prefab/Benchmark/PrefabBenchmarkFixture.h Prefab/Benchmark/PrefabCreateBenchmarks.cpp @@ -47,13 +49,13 @@ set(FILES Prefab/Benchmark/PrefabLoadBenchmarks.cpp Prefab/Benchmark/PrefabUpdateInstancesBenchmarks.cpp Prefab/Benchmark/SpawnableCreateBenchmarks.cpp - Prefab/Spawnable/SpawnableMetaDataTests.cpp Prefab/MockPrefabFileIOActionValidator.cpp Prefab/MockPrefabFileIOActionValidator.h Prefab/PrefabDuplicateTests.cpp Prefab/PrefabEntityAliasTests.cpp Prefab/PrefabInstanceToTemplatePropagatorTests.cpp Prefab/PrefabInstantiateTests.cpp + Prefab/PrefabInstantiateTests.cpp Prefab/PrefabLoadTemplateTests.cpp Prefab/PrefabTestComponent.cpp Prefab/PrefabTestComponent.h @@ -67,52 +69,50 @@ set(FILES Prefab/PrefabTestFixture.h Prefab/PrefabTestUndoFixture.cpp Prefab/PrefabTestUndoFixture.h + Prefab/PrefabTestUtils.h Prefab/PrefabUndoLinkTests.cpp Prefab/PrefabUndoTests.cpp - Prefab/PrefabTestUtils.h Prefab/PrefabUpdateInstancesTests.cpp Prefab/PrefabUpdateTemplateTests.cpp Prefab/PrefabUpdateWithPatchesTests.cpp - Prefab/PrefabInstantiateTests.cpp + Prefab/Spawnable/SpawnableMetaDataTests.cpp Prefab/SpawnableCreateTests.cpp - Prefab/SpawnableRemoveEditorInfoTests.cpp Prefab/SpawnableRemoveEditorInfoTestFixture.cpp Prefab/SpawnableRemoveEditorInfoTestFixture.h - Prefab/SpawnableSortEntitiesTests.cpp + Prefab/SpawnableRemoveEditorInfoTests.cpp Prefab/SpawnableSortEntitiesTestFixture.cpp Prefab/SpawnableSortEntitiesTestFixture.h - Entity/EditorEntityContextComponentTests.cpp - Entity/EditorEntityHelpersTests.cpp - Entity/EditorEntitySearchComponentTests.cpp - Entity/EditorEntitySelectionTests.cpp - SliceStabilityTests/SliceStabilityTestFramework.h - SliceStabilityTests/SliceStabilityTestFramework.cpp + Prefab/SpawnableSortEntitiesTests.cpp + PropertyIntCtrlCommonTests.h + PropertyIntSliderCtrlTests.cpp + PropertyIntSpinCtrlTests.cpp + PropertyTreeEditorTests.cpp + PythonBindingTests.cpp + QtWidgetLimitsTests.cpp + Script/ScriptComponentTests.cpp + Script/ScriptEntityTests.cpp + Slice.cpp + Slices.cpp SliceStabilityTests/SliceStabilityCreateTests.cpp SliceStabilityTests/SliceStabilityPushTests.cpp SliceStabilityTests/SliceStabilityReParentTests.cpp + SliceStabilityTests/SliceStabilityTestFramework.cpp + SliceStabilityTests/SliceStabilityTestFramework.h + SliceUpgradeTests.cpp + SliceUpgradeTestsData.h + SpinBoxTests.cpp + SQLiteConnectionTests.cpp + ThumbnailerTests.cpp ToolsComponents/EditorLayerComponentTests.cpp ToolsComponents/EditorTransformComponentTests.cpp + TransformComponent.cpp UI/EntityPropertyEditorTests.cpp + UndoStack.cpp + Viewport/ClusterTests.cpp Viewport/ViewportScreenTests.cpp Viewport/ViewportUiClusterTests.cpp Viewport/ViewportUiDisplayTests.cpp Viewport/ViewportUiManagerTests.cpp - Viewport/ClusterTests.cpp Viewport/ViewportUiWidgetManagerTests.cpp Visibility/EditorVisibilityTests.cpp - ComponentAdapterTests.cpp - ComponentAddRemove.cpp - EntityTestbed.h - GenericComponentWrapperTest.cpp - InstanceDataHierarchy.cpp - Slices.cpp - SQLiteConnectionTests.cpp - TransformComponent.cpp - EntityOwnershipService/EntityOwnershipServiceTestFixture.h - EntityOwnershipService/EntityOwnershipServiceTestFixture.cpp - EntityOwnershipService/SliceEditorEntityOwnershipTests.cpp - EntityOwnershipService/SliceEntityOwnershipTests.cpp - Script/ScriptComponentTests.cpp - Script/ScriptEntityTests.cpp - FileFunc.cpp ) From 91de09cff532b066938d34c832afd3306c1188c2 Mon Sep 17 00:00:00 2001 From: Benjamin Jillich <43751992+amzn-jillich@users.noreply.github.com> Date: Mon, 12 Jul 2021 23:32:35 -0700 Subject: [PATCH 055/300] EMotion FX: Root bone not initialized without opening Scene Settings (#2088) * User provided model was exporting correctly with an .assetinfo while it was not when just placing the .fbx file in the project folder. * Turned out that the best matching root bone was set by opening the Scene Settings for the first time, so after saving it again it worked correctly. * We're now chosing the best matching root bone when initializing the actor group, which fixes the issue. Signed-off-by: Benjamin Jillich --- .../Behaviors/ActorGroupBehavior.cpp | 1 + .../SceneAPIExt/Groups/ActorGroup.cpp | 20 +++++++++++++++++++ .../Pipeline/SceneAPIExt/Groups/ActorGroup.h | 2 +- .../Pipeline/SceneAPIExt/Groups/IActorGroup.h | 6 ++++++ 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp index c3202398b4..1e9c14d2e0 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Behaviors/ActorGroupBehavior.cpp @@ -143,6 +143,7 @@ namespace EMotionFX Group::ActorGroup* group = azrtti_cast(&target); group->SetName(AZ::SceneAPI::DataTypes::Utilities::CreateUniqueName(scene.GetName(), scene.GetManifest())); + group->SetBestMatchingRootBone(scene.GetGraph()); // LOD Rule need to be built first in the actor, so we know which mesh and bone belongs to LOD. // After this call, LOD rule will be populated with all the LOD bones diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp index e4065f58e0..b623086bc1 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp +++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp @@ -9,10 +9,14 @@ #include #include #include +#include +#include +#include #include #include #include #include +#include #include #include #include @@ -76,6 +80,22 @@ namespace EMotionFX m_selectedRootBone = selectedRootBone; } + void ActorGroup::SetBestMatchingRootBone(const AZ::SceneAPI::Containers::SceneGraph& sceneGraph) + { + auto nameContentView = AZ::SceneAPI::Containers::Views::MakePairView(sceneGraph.GetNameStorage(), sceneGraph.GetContentStorage()); + auto graphDownwardsView = AZ::SceneAPI::Containers::Views::MakeSceneGraphDownwardsView( + sceneGraph, sceneGraph.GetRoot(), nameContentView.begin(), true); + + for (auto it = graphDownwardsView.begin(); it != graphDownwardsView.end(); ++it) + { + if (it->second && it->second->RTTI_IsTypeOf(AZ::SceneData::GraphData::RootBoneData::TYPEINFO_Uuid())) + { + SetSelectedRootBone(it->first.GetPath()); + return; + } + } + } + void ActorGroup::Reflect(AZ::ReflectContext* context) { AZ::SerializeContext* serializeContext = azrtti_cast(context); diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h index fddb0d6afc..0725b3e88b 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h +++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.h @@ -45,8 +45,8 @@ namespace EMotionFX // IActorGroup overrides const AZStd::string& GetSelectedRootBone() const override; - void SetSelectedRootBone(const AZStd::string& selectedRootBone) override; + void SetBestMatchingRootBone(const AZ::SceneAPI::Containers::SceneGraph& sceneGraph) override; static void Reflect(AZ::ReflectContext* context); static bool IActorGroupVersionConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement); diff --git a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h index 398ec2c559..b57a9dfb13 100644 --- a/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h +++ b/Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/IActorGroup.h @@ -10,6 +10,11 @@ #include #include +namespace AZ::SceneAPI::Containers +{ + class SceneGraph; +} + namespace EMotionFX { namespace Pipeline @@ -26,6 +31,7 @@ namespace EMotionFX virtual const AZStd::string& GetSelectedRootBone() const = 0; virtual void SetSelectedRootBone(const AZStd::string& selectedRootBone) = 0; + virtual void SetBestMatchingRootBone(const AZ::SceneAPI::Containers::SceneGraph& sceneGraph) = 0; }; } } From 0c0d307caed58bc1277f825766aad30118155157 Mon Sep 17 00:00:00 2001 From: hultonha Date: Tue, 13 Jul 2021 14:49:27 +0100 Subject: [PATCH 056/300] ensure empty geometry buffers are not submitted for render Signed-off-by: hultonha --- .../Code/Source/Shape/ShapeGeometryUtil.cpp | 20 ++++---- .../Code/Source/Shape/TubeShape.cpp | 9 +++- .../Code/Tests/ShapeGeometryUtilTest.cpp | 47 +++++++++++++++++-- 3 files changed, 61 insertions(+), 15 deletions(-) diff --git a/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp b/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp index 9a52fa49f0..b0a52d4ca1 100644 --- a/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp +++ b/Gems/LmbrCentral/Code/Source/Shape/ShapeGeometryUtil.cpp @@ -31,22 +31,20 @@ namespace LmbrCentral return vertices + 1; } - void DrawShape( - AzFramework::DebugDisplayRequests& debugDisplay, - const ShapeDrawParams& shapeDrawParams, const ShapeMesh& shapeMesh) + void DrawShape(AzFramework::DebugDisplayRequests& debugDisplay, const ShapeDrawParams& shapeDrawParams, const ShapeMesh& shapeMesh) { if (shapeDrawParams.m_filled) { - debugDisplay.DrawTrianglesIndexed( - shapeMesh.m_vertexBuffer, - shapeMesh.m_indexBuffer, - shapeDrawParams.m_shapeColor - ); + if (!shapeMesh.m_vertexBuffer.empty() && !shapeMesh.m_indexBuffer.empty()) + { + debugDisplay.DrawTrianglesIndexed(shapeMesh.m_vertexBuffer, shapeMesh.m_indexBuffer, shapeDrawParams.m_shapeColor); + } } - debugDisplay.DrawLines( - shapeMesh.m_lineBuffer, - shapeDrawParams.m_wireColor); + if (!shapeMesh.m_lineBuffer.empty()) + { + debugDisplay.DrawLines(shapeMesh.m_lineBuffer, shapeDrawParams.m_wireColor); + } } /// Determine if a list of vertices constitute a simple polygon diff --git a/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp index 13762ad1ed..5c3e416008 100644 --- a/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp +++ b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp @@ -379,6 +379,13 @@ namespace LmbrCentral const float radius, const AZ::u32 capSegments, const AZ::u32 sides, AZStd::vector& vertexBufferOut) { + if (const size_t segmentCount = spline->GetSegmentCount(); segmentCount == 0) + { + // clear the buffers so we no longer draw anything + vertexBufferOut.clear(); + return; + } + // notes on vert buffer size // total end segments // 2 verts for each segment @@ -401,7 +408,7 @@ namespace LmbrCentral const size_t numVerts = totalEndSegments + totalSegments + totalLoops; vertexBufferOut.resize(numVerts); - AZ::Vector3* vertices = vertexBufferOut.begin(); + AZ::Vector3* vertices = vertexBufferOut.data(); // start cap auto address = spline->GetAddressByFraction(0.0f); diff --git a/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp b/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp index b486645694..eb8b0f4c51 100644 --- a/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp +++ b/Gems/LmbrCentral/Code/Tests/ShapeGeometryUtilTest.cpp @@ -6,12 +6,14 @@ */ #include "LmbrCentral_precompiled.h" -#include #include -#include -#include #include +#include +#include +#include +#include +#include namespace UnitTest { @@ -91,4 +93,43 @@ namespace UnitTest EXPECT_TRUE(triangles.size() == 18); } + + // test double to record if DrawTrianglesIndexed or DrawLines are called + class DebugShapeDebugDisplayRequests : public AzFramework::DebugDisplayRequests + { + public: + void DrawTrianglesIndexed( + [[maybe_unused]] const AZStd::vector& vertices, + [[maybe_unused]] const AZStd::vector& indices, + [[maybe_unused]] const AZ::Color& color) override + { + m_drawTrianglesIndexedCalled = true; + } + + void DrawLines([[maybe_unused]] const AZStd::vector& lines, [[maybe_unused]] const AZ::Color& color) override + { + m_drawLinesCalled = true; + } + + bool m_drawTrianglesIndexedCalled = false; + bool m_drawLinesCalled = false; + }; + + // DrawShape internally calls DrawTrianglesIndexed and DrawLines - with no geometry + // we want to make sure the shape is not submitted to be drawn + TEST(ShapeGeometry, Shape_not_attempted_to_be_drawn_with_no_geometry) + { + using ::testing::Eq; + + // given + DebugShapeDebugDisplayRequests debugDisplayRequests; + + // when + LmbrCentral::DrawShape( + debugDisplayRequests, LmbrCentral::ShapeDrawParams{ AZ::Colors::White, AZ::Colors::White, true }, LmbrCentral::ShapeMesh{}); + + // then + EXPECT_THAT(debugDisplayRequests.m_drawTrianglesIndexedCalled, Eq(false)); + EXPECT_THAT(debugDisplayRequests.m_drawLinesCalled, Eq(false)); + } } From b0707d3295f73cbe6367585d57ac08872fe0d252 Mon Sep 17 00:00:00 2001 From: hultonha Date: Tue, 13 Jul 2021 17:51:06 +0100 Subject: [PATCH 057/300] ensure the final vertex in a spline cannot be deleted using a manipulator Signed-off-by: hultonha --- .../Manipulators/EditorVertexSelection.cpp | 6 +++ .../Tests/EditorVertexSelectionTests.cpp | 54 +++++++++++++++++-- 2 files changed, 56 insertions(+), 4 deletions(-) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp index ce12d4839f..a0e689e61b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Manipulators/EditorVertexSelection.cpp @@ -1145,6 +1145,12 @@ namespace AzToolsFramework { if (interaction.m_keyboardModifiers.Alt()) { + if (!CanDeleteSelection(entityComponentIdPair.GetEntityId(), /*selectedCount=*/1)) + { + ShowVertexDeletionWarning(); + return; + } + SafeRemoveVertex(entityComponentIdPair, vertexIndex); } else diff --git a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp index e1656eb504..1376aa21dd 100644 --- a/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp +++ b/Code/Framework/AzToolsFramework/Tests/EditorVertexSelectionTests.cpp @@ -27,6 +27,8 @@ using namespace AzToolsFramework; namespace UnitTest { + const auto TestComponentId = AZ::ComponentId(1234); + // test implementation of variable/fixed vertex request buses // (to be used in place of spline/polygon prism etc) class TestVariableVerticesVertexContainer @@ -86,6 +88,9 @@ namespace UnitTest void TearDownEditorFixtureImpl() override { + AzToolsFramework::EditorEntityContextRequestBus::Broadcast( + &AzToolsFramework::EditorEntityContextRequestBus::Events::DestroyEditorEntity, m_entityId); + m_vertexContainer.Disconnect(); m_vertexSelection.Destroy(); } @@ -106,7 +111,7 @@ namespace UnitTest void EditorVertexSelectionFixture::RecreateVertexSelection() { m_vertexSelection.Create( - AZ::EntityComponentIdPair(m_entityId, AZ::InvalidComponentId), + AZ::EntityComponentIdPair(m_entityId, TestComponentId), g_mainManipulatorManagerId, AZStd::make_unique(), TranslationManipulators::Dimensions::Three, ConfigureTranslationManipulatorAppearance3d); } @@ -116,7 +121,7 @@ namespace UnitTest for (size_t vertIndex = 0; vertIndex < EditorVertexSelectionFixture::VertexCount; ++vertIndex) { InsertVertexAfter( - AZ::EntityComponentIdPair(m_entityId, AZ::InvalidComponentId), 0, AZ::Vector3::CreateZero()); + AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0, AZ::Vector3::CreateZero()); } } void EditorVertexSelectionFixture::ClearVertices() @@ -124,7 +129,7 @@ namespace UnitTest for (size_t vertIndex = 0; vertIndex < EditorVertexSelectionFixture::VertexCount; ++vertIndex) { SafeRemoveVertex( - AZ::EntityComponentIdPair(m_entityId, AZ::InvalidComponentId), 0); + AZ::EntityComponentIdPair(m_entityId, TestComponentId), 0); } } @@ -197,7 +202,7 @@ namespace UnitTest { using ::testing::Eq; - const auto entityComponentIdPair = AZ::EntityComponentIdPair(m_entityId, AZ::InvalidComponentId); + const auto entityComponentIdPair = AZ::EntityComponentIdPair(m_entityId, TestComponentId); const float horizontalPositions[] = {-1.5f, -0.5f, 0.5f, 1.5f}; for (size_t vertIndex = 0; vertIndex < std::size(horizontalPositions); ++vertIndex) @@ -252,4 +257,45 @@ namespace UnitTest // deleting all vertices is disallowed - size should remain the same EXPECT_THAT(vertexCountAfter, Eq(EditorVertexSelectionFixture::VertexCount)); } + + TEST_F(EditorVertexSelectionManipulatorFixture, CannotDeleteLastVertexWithManipulator) + { + using ::testing::Eq; + + const auto entityComponentIdPair = AZ::EntityComponentIdPair(m_entityId, TestComponentId); + + // add a single vertex (in front of the camera) + InsertVertexAfter(entityComponentIdPair, 0, AZ::Vector3::CreateAxisY(5.0f)); + + // rebuild the vertex selection after adding the new verts + RecreateVertexSelection(); + + AzFramework::ScreenPoint vertexScreenPosition; + { + AZ::Vector3 localVertex; + bool found = false; + AZ::FixedVerticesRequestBus::EventResult( + found, m_entityId, &AZ::FixedVerticesRequestBus::Handler::GetVertex, 0, localVertex); + + if (found) + { + // note: entity position is at the origin so localVertex position is equivalent to world + vertexScreenPosition = AzFramework::WorldToScreen(localVertex, m_cameraState); + } + } + + // attempt to delete the vertex by clicking with Alt held + m_actionDispatcher->CameraState(m_cameraState) + ->MousePosition(vertexScreenPosition) + ->KeyboardModifierDown(AzToolsFramework::ViewportInteraction::KeyboardModifier::Alt) + ->MouseLButtonDown() + ->MouseLButtonUp(); + + size_t vertexCountAfter = 0; + AZ::VariableVerticesRequestBus::EventResult( + vertexCountAfter, m_entityId, &AZ::VariableVerticesRequestBus::Events::Size); + + // deleting the last vertex through a manipulator is disallowed - size should remain the same + EXPECT_THAT(vertexCountAfter, Eq(1)); + } } // namespace UnitTest From 402fd2ae4ef42a3dd5dd75fe7d12ac453f084780 Mon Sep 17 00:00:00 2001 From: hultonha Date: Tue, 13 Jul 2021 18:10:33 +0100 Subject: [PATCH 058/300] small updates following review feedback Signed-off-by: hultonha --- Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp index 5c3e416008..b9d7a628a0 100644 --- a/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp +++ b/Gems/LmbrCentral/Code/Source/Shape/TubeShape.cpp @@ -1,6 +1,6 @@ /* * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * + * * SPDX-License-Identifier: Apache-2.0 OR MIT * */ @@ -131,7 +131,7 @@ namespace LmbrCentral m_variableRadius.SetElement(vertIndex, radius); ValidateVariableRadius(vertIndex); } - + ShapeComponentNotificationsBus::Event( m_entityId, &ShapeComponentNotificationsBus::Events::OnShapeChanged, ShapeComponentNotifications::ShapeChangeReasons::ShapeChanged); @@ -379,9 +379,10 @@ namespace LmbrCentral const float radius, const AZ::u32 capSegments, const AZ::u32 sides, AZStd::vector& vertexBufferOut) { - if (const size_t segmentCount = spline->GetSegmentCount(); segmentCount == 0) + const size_t segmentCount = spline->GetSegmentCount(); + if (segmentCount == 0) { - // clear the buffers so we no longer draw anything + // clear the buffer so we no longer draw anything vertexBufferOut.clear(); return; } @@ -400,7 +401,7 @@ namespace LmbrCentral // 2 verts for each segment // loops == sides // 2 loops per segment - const AZ::u32 segments = spline->GetSegmentCount() * spline->GetSegmentGranularity(); + const AZ::u32 segments = segmentCount * spline->GetSegmentGranularity(); const AZ::u32 totalEndSegments = capSegments * 2 * 2 * 2 * 2; const AZ::u32 totalSegments = segments * 2 * 2 * 2; const AZ::u32 totalLoops = 2 * sides * segments * 2; @@ -429,7 +430,7 @@ namespace LmbrCentral // body const float stepDelta = 1.0f / static_cast(spline->GetSegmentGranularity()); auto nextAddress = address; - const auto endIndex = address.m_segmentIndex + spline->GetSegmentCount(); + const auto endIndex = address.m_segmentIndex + segmentCount; while (address.m_segmentIndex < endIndex) { address.m_segmentFraction = 0.f; From 9939913c8df0b9e3b5644a622f7d696883b94d82 Mon Sep 17 00:00:00 2001 From: hultonha Date: Tue, 13 Jul 2021 18:23:19 +0100 Subject: [PATCH 059/300] update MSVC to use new lambda processing Signed-off-by: hultonha --- cmake/Platform/Common/MSVC/Configurations_msvc.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake index cad0e818cb..a1ded72255 100644 --- a/cmake/Platform/Common/MSVC/Configurations_msvc.cmake +++ b/cmake/Platform/Common/MSVC/Configurations_msvc.cmake @@ -77,6 +77,7 @@ ly_append_configurations_options( /Zc:forScope # Force Conformance in for Loop Scope /diagnostics:caret # Compiler diagnostic options: includes the column where the issue was found and places a caret (^) under the location in the line of code where the issue was detected. /Zc:__cplusplus + /Zc:lambda # Use the new lambda processor (See https://developercommunity.visualstudio.com/t/A-lambda-that-binds-the-this-pointer-w/1467873 for more details) /favor:AMD64 # Create Code optimized for 64 bit /bigobj # Increase number of sections in obj files. Profiling has shown no meaningful impact in memory nore build times COMPILATION_DEBUG From 42bfefe6c0371688f320a7295ceb823f94e96d90 Mon Sep 17 00:00:00 2001 From: Chris Galvan Date: Tue, 13 Jul 2021 13:02:11 -0500 Subject: [PATCH 060/300] Make new input event groups auto-expanded by default. Signed-off-by: Chris Galvan --- Gems/StartingPointInput/Code/Source/InputEventGroup.h | 1 + 1 file changed, 1 insertion(+) diff --git a/Gems/StartingPointInput/Code/Source/InputEventGroup.h b/Gems/StartingPointInput/Code/Source/InputEventGroup.h index 0ef9797f24..88a27cf3ee 100644 --- a/Gems/StartingPointInput/Code/Source/InputEventGroup.h +++ b/Gems/StartingPointInput/Code/Source/InputEventGroup.h @@ -37,6 +37,7 @@ namespace StartingPointInput editContext->Class("InputEventGroup", "Groups input bindings by the event they generate") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &InputEventGroup::GetEditorText) + ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ->DataElement(0, &InputEventGroup::m_eventName, "Event Name", "The event generated by the collection of Input Bindings") ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ_CRC("RefreshAttributesAndValues")) ->DataElement(0, &InputEventGroup::m_inputHandlers, "Event Generators", "Handlers that generate named events") From 2f2bbc7d43bec1646419f09b33c3040218aff9cc Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 11:02:16 -0700 Subject: [PATCH 061/300] no message Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../AzCore/std/function/function_template.h | 1 + .../Application/ToolsApplication.cpp | 1 - .../Asset/AssetProcessorMessages.cpp | 1 - .../Asset/AssetSystemComponent.cpp | 2 -- .../AssetBrowser/AssetSelectionModel.cpp | 1 - .../AssetDatabase/AssetDatabaseConnection.cpp | 1 - .../AssetEditor/AssetEditorBus.h | 1 + .../AssetEditor/AssetEditorHeader.cpp | 1 - .../AssetEditor/AssetEditorHeader.h | 1 + .../AssetEditor/AssetEditorWidget.cpp | 1 - .../AzToolsFramework_precompiled.h | 28 ------------------- .../Commands/BaseSliceCommand.cpp | 1 - .../Commands/CreateSliceCommand.cpp | 1 - .../DetachSubSliceInstanceCommand.cpp | 1 - .../Commands/EntityStateCommand.cpp | 1 - .../Commands/EntityTransformCommand.cpp | 1 - .../Commands/PreemptiveUndoCache.cpp | 1 - .../Commands/PushToSliceCommand.cpp | 1 - .../Commands/SelectionCommand.cpp | 1 - .../Commands/SliceDetachEntityCommand.cpp | 1 - .../Entity/EditorEntityContextComponent.cpp | 1 - .../Entity/EditorEntityFixupComponent.cpp | 1 - .../Entity/EditorEntityModel.cpp | 1 - .../Slice/SliceDataFlagsCommand.cpp | 1 - .../SliceMetadataEntityContextComponent.cpp | 1 - .../Slice/SliceRequestComponent.cpp | 1 - .../Slice/SliceTransaction.cpp | 1 - .../AzToolsFramework/Slice/SliceUtilities.cpp | 2 +- .../SourceControl/LocalFileSCComponent.cpp | 1 - .../SourceControl/PerforceComponent.cpp | 1 - .../SourceControl/PerforceConnection.cpp | 1 - .../QtSourceControlNotificationHandler.cpp | 1 - .../ComponentAssetMimeDataContainer.cpp | 1 - .../ComponentAssetMimeDataContainer.h | 2 ++ .../EditorAssetMimeDataContainer.cpp | 1 - .../EditorAssetMimeDataContainer.h | 2 ++ .../ToolsComponents/EditorAssetReference.cpp | 1 - .../ToolsComponents/EditorComponentBase.cpp | 1 - .../EditorDisabledCompositionComponent.cpp | 1 - .../EditorEntityIconComponent.cpp | 1 - .../EditorEntityIdContainer.cpp | 1 - .../ToolsComponents/EditorLayerComponent.cpp | 1 - .../ToolsComponents/EditorLockComponent.cpp | 1 - .../EditorOnlyEntityComponent.cpp | 1 - .../EditorPendingCompositionComponent.cpp | 1 - .../EditorSelectionAccentSystemComponent.cpp | 1 - .../EditorVisibilityComponent.cpp | 1 - .../GenericComponentWrapper.cpp | 1 - .../ToolsComponents/LayerResult.cpp | 2 +- .../ToolsComponents/LayerResult.h | 2 ++ .../ToolsComponents/ScriptEditorComponent.cpp | 1 - .../ToolsComponents/SelectionComponent.cpp | 1 - .../ToolsComponents/TransformComponent.cpp | 1 - .../ComponentPaletteModel.cpp | 1 - .../ComponentPaletteModelFilter.cpp | 1 - .../ComponentPalette/ComponentPaletteUtil.cpp | 1 - .../ComponentPaletteWidget.cpp | 1 - .../UI/Layer/AddToLayerMenu.cpp | 2 +- .../Core/EditorFrameworkAPI.cpp | 3 +- .../LegacyFramework/Core/EditorFrameworkAPI.h | 13 ++------- .../Core/EditorFrameworkApplication.cpp | 2 +- .../UI/LegacyFramework/Core/IPCComponent.cpp | 1 - .../CustomMenus/CustomMenusComponent.cpp | 1 - .../LegacyFramework/MainWindowSavedState.cpp | 1 - .../UI/LegacyFramework/UIFramework.cpp | 1 - .../UI/LegacyFramework/UIFrameworkAPI.cpp | 2 +- .../UIFrameworkPreferences.cpp | 1 - .../UI/Logging/GenericLogPanel.cpp | 1 - .../UI/Logging/LogControl.cpp | 2 +- .../UI/Logging/LogPanel_Panel.cpp | 4 ++- .../UI/Logging/NewLogTabDialog.cpp | 1 - .../UI/Logging/TracePrintFLogPanel.cpp | 1 - .../UI/PropertyEditor/ComponentEditor.cpp | 2 +- .../PropertyEditor/ComponentEditorHeader.cpp | 1 - .../UI/PropertyEditor/DHQComboBox.cpp | 1 - .../UI/PropertyEditor/DHQSlider.cpp | 1 - .../UI/PropertyEditor/EntityIdQLabel.cpp | 1 - .../UI/PropertyEditor/EntityIdQLineEdit.cpp | 1 - .../PropertyEditor/EntityPropertyEditor.cpp | 1 - .../PropertyEditor/InstanceDataHierarchy.cpp | 1 - .../UI/PropertyEditor/PropertyAssetCtrl.cpp | 1 - .../UI/PropertyEditor/PropertyAudioCtrl.cpp | 1 - .../PropertyBoolComboBoxCtrl.cpp | 1 - .../PropertyBoolRadioButtonsCtrl.cpp | 1 - .../UI/PropertyEditor/PropertyButtonCtrl.cpp | 2 +- .../UI/PropertyEditor/PropertyCRCCtrl.cpp | 2 +- .../PropertyEditor/PropertyCheckBoxCtrl.cpp | 1 - .../UI/PropertyEditor/PropertyColorCtrl.cpp | 1 - .../PropertyDoubleSliderCtrl.cpp | 1 - .../PropertyEditor/PropertyDoubleSpinCtrl.cpp | 1 - .../UI/PropertyEditor/PropertyEditorApi.cpp | 1 - .../PropertyEditor/PropertyEntityIdCtrl.cpp | 2 +- .../PropertyEnumComboBoxCtrl.cpp | 1 - .../PropertyEditor/PropertyIntSliderCtrl.cpp | 1 - .../UI/PropertyEditor/PropertyIntSpinCtrl.cpp | 1 - .../PropertyManagerComponent.cpp | 1 - .../UI/PropertyEditor/PropertyRowWidget.cpp | 1 - .../UI/PropertyEditor/PropertyRowWidget.hxx | 1 + .../PropertyStringComboBoxCtrl.cpp | 1 - .../PropertyStringLineEditCtrl.cpp | 1 - .../UI/PropertyEditor/PropertyVectorCtrl.cpp | 1 - .../ReflectedPropertyEditor.cpp | 3 +- .../UI/SearchWidget/SearchCriteriaWidget.cpp | 3 +- .../SliceOverridesNotificationWindow.cpp | 4 ++- .../SliceOverridesNotificationWindow.hxx | 4 +++ ...liceOverridesNotificationWindowManager.cpp | 1 - ...liceOverridesNotificationWindowManager.hxx | 1 + .../UI/Slice/SlicePushWidget.cpp | 3 +- .../UI/Slice/SliceRelationshipWidget.cpp | 4 +-- .../UI/Slice/SliceRelationshipWidget.hxx | 5 ++++ .../UI/UICore/AZAutoSizingScrollArea.cpp | 1 - .../UICore/AspectRatioAwarePixmapWidget.cpp | 2 +- .../UI/UICore/ClickableLabel.cpp | 1 - .../UI/UICore/ColorPickerDelegate.cpp | 1 - .../UI/UICore/OverwritePromptDialog.cpp | 1 - .../UI/UICore/PlainTextEdit.cpp | 3 +- .../UI/UICore/ProgressShield.cpp | 1 - .../UI/UICore/QTreeViewStateSaver.cpp | 1 - .../UI/UICore/QWidgetSavedState.cpp | 1 - .../UI/UICore/SaveChangesDialog.cpp | 1 - .../UI/UICore/TargetSelectorButton.cpp | 1 - .../AzToolsFramework/Undo/UndoSystem.cpp | 1 - .../AzToolsFramework/ViewportUi/Button.cpp | 1 - .../ViewportUi/ViewportUiCluster.cpp | 1 - .../ViewportUi/ViewportUiDisplay.cpp | 1 - .../ViewportUi/ViewportUiDisplayLayout.cpp | 2 +- .../ViewportUi/ViewportUiManager.cpp | 1 - .../ViewportUi/ViewportUiTextField.cpp | 1 - .../ViewportUi/ViewportUiTextField.h | 2 ++ .../ViewportUi/ViewportUiWidgetCallbacks.cpp | 1 - .../aztoolsframework_files.cmake | 1 - .../commit_validation/pal_allowedlist.txt | 1 - 132 files changed, 54 insertions(+), 160 deletions(-) delete mode 100644 Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h diff --git a/Code/Framework/AzCore/AzCore/std/function/function_template.h b/Code/Framework/AzCore/AzCore/std/function/function_template.h index 62175b566f..f3f71c4c70 100644 --- a/Code/Framework/AzCore/AzCore/std/function/function_template.h +++ b/Code/Framework/AzCore/AzCore/std/function/function_template.h @@ -9,6 +9,7 @@ #include #include #include +#include #if defined(AZ_COMPILER_MSVC) # pragma warning( push ) diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp index 95f13dc649..1e9f9e052a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp index 3b06a1e249..71cdf1d3de 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp index cf96a624fb..0d24605a59 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" - #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp index 7d7c0907c1..12614551fc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetSelectionModel.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp index 4485b0fc5e..ce5ed9f4d2 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetDatabase/AssetDatabaseConnection.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h index 260ce3824d..5e7a25c144 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorBus.h @@ -10,6 +10,7 @@ #include #include #include +#include namespace AZ { namespace Data { class AssetData; } } diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp index d2e5225745..42c6b52f01 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "AssetEditorHeader.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h index 3b0d8794c1..2ba72ae0fb 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorHeader.h @@ -8,6 +8,7 @@ #include #include +#include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp index a13e5acf84..778edf1950 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "AssetEditorWidget.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h b/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h deleted file mode 100644 index 2c3443a910..0000000000 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include - -// QT -AZ_PUSH_DISABLE_WARNING(4127, "-Wunknown-warning-option") // conditional expression is constant -#include -AZ_POP_DISABLE_WARNING -#include -#include -#include -#include - -#if defined(AZ_PLATFORM_APPLE_OSX) || defined(AZ_PLATFORM_LINUX) -typedef void* HWND; -typedef void* HMODULE; -typedef quint32 DWORD; -#define _MAX_PATH 260 -#define MAX_PATH 260 -#endif diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp index 966b2c3aa6..2c256c2394 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/BaseSliceCommand.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "BaseSliceCommand.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp index 8c5223ed9f..f2c2615774 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/CreateSliceCommand.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "CreateSliceCommand.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp index d6f10bab03..6e0f061110 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/DetachSubSliceInstanceCommand.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "DetachSubSliceInstanceCommand.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp index a6cad1ff65..052a7a4c58 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityStateCommand.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EntityStateCommand.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp index 7c6fc8381d..d778784a2c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/EntityTransformCommand.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #if 0 diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp index a967b654cd..1b4aebf29b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PreemptiveUndoCache.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp index a416188a01..a3c127093e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/PushToSliceCommand.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PushToSliceCommand.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp index 07c076873f..d6a03fad6c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SelectionCommand.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "SelectionCommand.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp index 27bce797bd..147ee94309 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Commands/SliceDetachEntityCommand.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "SliceDetachEntityCommand.h" namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp index daaac12f14..e6ca864065 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityContextComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp index 502dd8cfa6..a3de40c30c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp index 2f832b5d5d..e85bb14ea7 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModel.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorEntityModel.h" #include "EditorEntitySortBus.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp index 138851580d..1caa7acc53 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDataFlagsCommand.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "SliceDataFlagsCommand.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp index f83569bb13..c38ac21b4b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp index 043ed2f1a3..0913b9aafd 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceRequestComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp index 81aacf9372..7ffea359e1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceTransaction.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp index b5c8058f73..44c868f866 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include #include @@ -61,6 +60,7 @@ #include AZ_PUSH_DISABLE_WARNING(4251 4244, "-Wunknown-warning-option") // 4251: class '...' needs to have dll-interface to be used by clients of class '...' // 4244: 'argument': conversion from 'int' to 'float', possible loss of data +#include #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp index db766eae61..423b4fee7a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/LocalFileSCComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp index 8685dd1eec..83bae70554 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp index 6ed42a28a9..d46dda9587 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceConnection.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp index 5f78008661..3e65daf64b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/QtSourceControlNotificationHandler.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp index bb16f7ecfe..a40528f8c3 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "ComponentAssetMimeDataContainer.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h index 2918885bdc..b615f83df9 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ComponentAssetMimeDataContainer.h @@ -13,6 +13,8 @@ #include #include +#include + namespace AZ { struct ClassDataReflection; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp index 050034bce4..376cda1ccb 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorAssetMimeDataContainer.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h index 6edeff2785..291bb7bb7e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetMimeDataContainer.h @@ -13,6 +13,8 @@ #include #include +#include + namespace AZ { struct ClassDataReflection; diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp index e6e7c86acc..6ef5c3c207 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorAssetReference.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorAssetReference.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp index 38aa806f44..afc8e31b53 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorComponentBase.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorComponentBase.h" #include "TransformComponent.h" #include "SelectionComponent.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp index 20ef7e64d4..4a9a3b4027 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorDisabledCompositionComponent.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp index c25450949c..95d1de206f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorEntityIconComponent.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp index 613edb0d1b..1041395a7f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIdContainer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorEntityIdContainer.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp index 5a73129e92..ffae79e13a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLayerComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorLayerComponent.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp index 4224b7de9f..bf34dcca9b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorLockComponent.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp index 848c324f2f..07e68cf70e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp index 0ce45bd4db..ae8f608325 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorPendingCompositionComponent.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp index 4c193b587e..4a1e5bc4cc 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorSelectionAccentSystemComponent.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp index 77e491e840..162874cc8d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EditorVisibilityComponent.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp index 72c34ac3f9..766c03e950 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp index b6bf985857..fad08c96de 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.cpp @@ -5,10 +5,10 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "LayerResult.h" #include +#include namespace AzToolsFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h index 0120f58955..8840d9d295 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/LayerResult.h @@ -6,6 +6,8 @@ */ #pragma once +#include + namespace AzToolsFramework { namespace Layers diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp index 31a9a2da8e..7612dcb4f1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp @@ -6,7 +6,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp index 6bcebbe009..626dec7fa5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/SelectionComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "SelectionComponent.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp index eea6696e4e..34e18bfe4e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "TransformComponent.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp index 817494f7f2..b68993f3ea 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModel.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "ComponentPaletteModel.hxx" namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp index 66de920903..096cd88577 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteModelFilter.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "ComponentPaletteModelFilter.hxx" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp index be8bb1ed9a..a35251d378 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteUtil.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "ComponentPaletteUtil.hxx" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp index 19258647e7..9a64c45935 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/ComponentPalette/ComponentPaletteWidget.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "ComponentPaletteModel.hxx" #include "ComponentPaletteUtil.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp index 170d725bfa..5dd9249920 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Layer/AddToLayerMenu.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "AddToLayerMenu.h" #include @@ -21,6 +20,7 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QLayoutItem::align #include #include AZ_POP_DISABLE_WARNING +#include namespace AzToolsFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp index 71d077d284..aba72227d1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.cpp @@ -5,12 +5,13 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include #include "EditorFrameworkAPI.h" +#include + namespace LegacyFramework { const char* appName() diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h index 854f762d0f..b6804cc974 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkAPI.h @@ -5,16 +5,15 @@ * */ -#ifndef EditorFrameworkAPI_H -#define EditorFrameworkAPI_H +#pragma once #include #include #include +#include +#include #include -#pragma once - // this file contains the API for the buses that the framework communicates on to NON-GUI-CLIENTS // note that this does not include UI messaging, this is for non-ui parts of it! @@ -23,10 +22,6 @@ namespace AZ class SerializeContext; } -#ifdef AZ_PLATFORM_WINDOWS - typedef HINSTANCE HMODULE; -#endif - namespace LegacyFramework { // we agree that an entity list is a list of entity IDs @@ -328,5 +323,3 @@ namespace LegacyFramework typedef AZ::EBus IPCCommandBus; }; - -#endif diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp index f342b1afab..2f5e402791 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/EditorFrameworkApplication.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include "EditorFrameworkApplication.h" @@ -53,6 +52,7 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QFileInfo::d_ptr': AZ_POP_DISABLE_OVERRIDE_WARNING #include #include +#include namespace LegacyFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp index 38b65c3454..4ee7d8da5c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/Core/IPCComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "IPCComponent.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp index ac0430a62a..2be418859d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/CustomMenus/CustomMenusComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp index f256dc703e..50554d5b2b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/MainWindowSavedState.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "MainWindowSavedState.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp index 9150ef35c4..7068210b99 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFramework.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "UIFramework.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp index daf516c808..2869dc2c78 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkAPI.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "UIFrameworkAPI.h" #include #include @@ -17,6 +16,7 @@ #include #include +#include namespace AzToolsFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp index 51f88c1dde..a12ffea312 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/LegacyFramework/UIFrameworkPreferences.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "UIFramework.hxx" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp index 6402848300..2f1acf71d5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/GenericLogPanel.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "GenericLogPanel.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp index 2624624f2e..0440d3be8f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogControl.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "LogControl.h" #include "LoggingCommon.h" @@ -19,6 +18,7 @@ AZ_POP_DISABLE_WARNING #include #include #include +#include #include "LogPanel_Panel.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp index b65cd14f8e..5da601503d 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/LogPanel_Panel.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "LogPanel_Panel.h" @@ -32,6 +31,9 @@ AZ_PUSH_DISABLE_WARNING(4244 4251 4800, "-Wunknown-warning-option") // 4244: con // 4800 'QTextEngine *const ': forcing value to bool 'true' or 'false' (performance warning) #include AZ_POP_DISABLE_WARNING +#include +#include + #include #include "NewLogTabDialog.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp index 5b29777054..a7f776f85c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/NewLogTabDialog.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp index f67bf27149..c1f34e373f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Logging/TracePrintFLogPanel.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "TracePrintFLogPanel.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp index 4c151bebef..df28a4c42e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditor.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "ComponentEditor.hxx" #include "ComponentEditorHeader.hxx" @@ -35,6 +34,7 @@ AZ_PUSH_DISABLE_WARNING(4251 4244, "-Wunknown-warning-option") // 4251: 'QInputE // 4244: 'return': conversion from 'qreal' to 'int', possible loss of data #include AZ_POP_DISABLE_WARNING +#include #include namespace AzToolsFramework diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp index 4998eec360..61daff0513 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ComponentEditorHeader.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "ComponentEditorHeader.hxx" #include "PropertyRowWidget.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp index 4136d19087..bff82efee2 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQComboBox.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "DHQComboBox.hxx" AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option") // 4244: conversion from 'int' to 'float', possible loss of data diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp index f6eed6bfd1..849613e02f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/DHQSlider.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "DHQSlider.hxx" #include "PropertyQTConstants.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp index 1f01389d57..eb287654a1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLabel.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EntityIdQLabel.hxx" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp index 6e24641ffc..69f446833c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityIdQLineEdit.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "EntityIdQLineEdit.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp index 5d1ec93fda..a18511e6e8 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp @@ -7,7 +7,6 @@ #include AZ_PUSH_DISABLE_WARNING(4127, "-Wunknown-warning-option") // conditional expression is constant -#include "AzToolsFramework_precompiled.h" #include "EntityPropertyEditor.hxx" AZ_POP_DISABLE_WARNING diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp index f411c60625..7e192ea840 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "InstanceDataHierarchy.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp index ba53688aa4..7f0aa1bdf5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAssetCtrl.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyAssetCtrl.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp index 599fa7bdfe..cde6c7b0f6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyAudioCtrl.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyAudioCtrl.h" #include "PropertyQTConstants.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp index 28f6d6af65..4508dd6a28 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolComboBoxCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyBoolComboBoxCtrl.hxx" #include "PropertyQTConstants.h" #include "DHQComboBox.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp index 8c7fb1757e..f02182c7d0 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyBoolRadioButtonsCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp index c03d276ed7..b78de50a65 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyButtonCtrl.cpp @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyButtonCtrl.hxx" #include "PropertyQTConstants.h" #include AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QLayoutItem::align': class 'QFlags' needs to have dll-interface to be used by clients of class 'QLayoutItem' #include AZ_POP_DISABLE_WARNING +#include namespace AzToolsFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp index 523cbe1ca0..4c328d7b74 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCRCCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyCRCCtrl.h" #include "PropertyQTConstants.h" #include @@ -14,6 +13,7 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QLayoutItem: #include AZ_POP_DISABLE_WARNING #include +#include namespace AzToolsFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp index b637bc61c6..84fb363b84 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyCheckBoxCtrl.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyCheckBoxCtrl.hxx" #include "PropertyQTConstants.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp index 9368685af4..c6772729d9 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyColorCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyColorCtrl.hxx" #include "PropertyQTConstants.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp index aac2d70d20..84d1d2be7e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSliderCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include "PropertyDoubleSliderCtrl.hxx" #include "DHQSlider.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp index 01c85f11c9..78363e6b8a 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyDoubleSpinCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyDoubleSpinCtrl.hxx" #include "PropertyQTConstants.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp index ccd9c367bf..d8e339b798 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorApi.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyEditorAPI.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp index 92d0ea9139..f59586a370 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEntityIdCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyEntityIdCtrl.hxx" #include "PropertyQTConstants.h" @@ -33,6 +32,7 @@ AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option") // 4244: conversi AZ_POP_DISABLE_WARNING #include #include +#include //just a test to see how it would work to pop a dialog diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp index 571a293333..3aa8bacb6e 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEnumComboBoxCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyEnumComboBoxCtrl.hxx" #include "PropertyQTConstants.h" #include "DHQComboBox.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp index 041fc2dab1..a4a788ae72 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSliderCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyIntSliderCtrl.hxx" #include "DHQSlider.hxx" #include "PropertyQTConstants.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp index 5edefdd8a1..defa819b81 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyIntSpinCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyIntSpinCtrl.hxx" #include "PropertyQTConstants.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp index 617a6e2823..b6466daf25 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyManagerComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyManagerComponent.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp index d66ee34c3b..7fb51644ce 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyRowWidget.hxx" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx index b23691ea44..0d507754c9 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyRowWidget.hxx @@ -8,6 +8,7 @@ #pragma once #if !defined(Q_MOC_RUN) +#include AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // class '...' needs to have dll-interface to be used by clients of class '...' #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp index e8c8157c98..e352a75aee 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringComboBoxCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyStringComboBoxCtrl.hxx" #include "PropertyQTConstants.h" #include "DHQComboBox.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp index 58414d6c37..5ad90a583b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyStringLineEditCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyStringLineEditCtrl.hxx" #include "PropertyQTConstants.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp index 662a17ebb7..20f00af7d0 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyVectorCtrl.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "PropertyVectorCtrl.hxx" #include "PropertyQTConstants.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp index 1e7b0395c8..bad47f7003 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/ReflectedPropertyEditor.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "ReflectedPropertyEditor.hxx" #include "PropertyRowWidget.hxx" #include @@ -17,6 +16,8 @@ #include #include #include +#include +#include AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QTextFormat::d': class 'QSharedDataPointer' needs to have dll-interface to be used by clients of class 'QTextFormat' #include AZ_POP_DISABLE_WARNING diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp index 15a7b7d482..9cb9449ea2 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/SearchWidget/SearchCriteriaWidget.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" + +#include AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QLayoutItem::align': class 'QFlags' needs to have dll-interface to be used by clients of class 'QLayoutItem' #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp index b131e3d560..0e2aa26cfe 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.cpp @@ -4,7 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" + +#include + AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QLayoutItem::align': class 'QFlags' needs to have dll-interface to be used by clients of class 'QLayoutItem' #include AZ_POP_DISABLE_WARNING diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx index 29314c32fe..318d01ad12 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindow.hxx @@ -6,12 +6,16 @@ */ #pragma once +#include + namespace Ui { class NotificationWindow; } class QToolButton; +class QLabel; +class QTimer; namespace AzToolsFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp index f7b1521ee6..139920dca5 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx index 8fbb397dd4..385b9bd154 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceOverridesNotificationWindowManager.hxx @@ -11,6 +11,7 @@ #include "SliceOverridesNotificationWindow.hxx" #endif +#include namespace AzToolsFramework { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp index d88799d5aa..a9bb8089f6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SlicePushWidget.cpp @@ -5,10 +5,9 @@ * */ -#include "AzToolsFramework_precompiled.h" +#include AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option") - #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp index 61045de69a..8ad24dc73c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.cpp @@ -5,8 +5,7 @@ * */ -#include "AzToolsFramework_precompiled.h" - +#include #include #include AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 4251: 'QTreeWidgetItemIterator::d_ptr': class 'QScopedPointer>' needs to have dll-interface to be used by clients of class 'QTreeWidgetItemIterator' @@ -19,6 +18,7 @@ AZ_POP_DISABLE_WARNING #include "SliceRelationshipWidget.hxx" +#include #include #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx index 2a1a7e74d9..0bffc06ba4 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Slice/SliceRelationshipWidget.hxx @@ -18,6 +18,11 @@ class QTreeWidgetItem; class QLabel; class QVBoxLayout; +namespace AZ +{ + class EntityId; +} + namespace AzToolsFramework { /** diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp index 4e73acbb40..0bf6516384 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AZAutoSizingScrollArea.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "AZAutoSizingScrollArea.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp index b3b2c3ad21..a6222703bb 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/AspectRatioAwarePixmapWidget.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" +#include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // 4251: 'QPainter::d_ptr': class 'QScopedPointer>' needs to have dll-interface to be used by clients of class 'QPainter' // 4800: 'QFlags::Int': forcing value to bool 'true' or 'false' (performance warning) #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp index 99400ae39d..ea8f6977eb 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ClickableLabel.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "ClickableLabel.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp index 814fa1c28f..f3bb79e488 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ColorPickerDelegate.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include #include "ColorPickerDelegate.hxx" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp index ad425ea615..eca103ce9b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/OverwritePromptDialog.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "OverwritePromptDialog.hxx" AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") // 'QLayoutItem::align': class 'QFlags' needs to have dll-interface to be used by clients of class 'QLayoutItem' diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp index ceaf0d0090..a0505c23aa 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/PlainTextEdit.cpp @@ -5,11 +5,12 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "PlainTextEdit.hxx" #include +#include + namespace AzToolsFramework { QRectF PlainTextEdit::GetBlockBoundingGeometry(const QTextBlock& block) const diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp index 904cf417a4..fdbbb4714f 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/ProgressShield.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp index 10fb8accfc..c77cc68c4b 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QTreeViewStateSaver.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "QTreeViewStateSaver.hxx" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp index 82b8a4aa92..858dcb2290 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/QWidgetSavedState.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "QWidgetSavedState.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp index 5c94a6c0bd..eb4f7e8991 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/SaveChangesDialog.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "SaveChangesDialog.hxx" AZ_PUSH_DISABLE_WARNING(4244 4251, "-Wunknown-warning-option") diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp index 7f65eefde5..57adde8b7c 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/UICore/TargetSelectorButton.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp index 49e2f89854..440ad97cf1 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Undo/UndoSystem.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AzToolsFramework_precompiled.h" #include "UndoSystem.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp index 8acb21ca18..ebba394986 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/Button.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp index 75d352906e..d5f528fefa 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiCluster.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp index 5609cdac06..3eb08f89ea 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp index 2f6e88f9cb..96d5e8f200 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplayLayout.cpp @@ -5,10 +5,10 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include +#include namespace AzToolsFramework::ViewportUi::Internal { diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp index d4e839baec..0d1e8001d2 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiManager.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include #include diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp index 95d36dec83..abedf96fc6 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "ViewportUiTextField.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h index d3ca65a152..fec88c0a06 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiTextField.h @@ -16,6 +16,8 @@ AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") #include AZ_POP_DISABLE_WARNING +#include + namespace AzToolsFramework::ViewportUi::Internal { //! Helper class for a widget that holds and manages multiple LabelTextFields. diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp index 82db5bb7b9..8af8423e78 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiWidgetCallbacks.cpp @@ -5,7 +5,6 @@ * */ -#include "AzToolsFramework_precompiled.h" #include "ViewportUiWidgetCallbacks.h" diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake index 7fbde67ce4..23665d8eba 100644 --- a/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake +++ b/Code/Framework/AzToolsFramework/AzToolsFramework/aztoolsframework_files.cmake @@ -6,7 +6,6 @@ # set(FILES - AzToolsFramework_precompiled.h AssetEditor/AssetEditorBus.h AssetEditor/AssetEditorToolbar.ui AssetEditor/AssetEditorStatusBar.ui diff --git a/scripts/commit_validation/commit_validation/pal_allowedlist.txt b/scripts/commit_validation/commit_validation/pal_allowedlist.txt index 5ea71e0363..4c90bcb6b4 100644 --- a/scripts/commit_validation/commit_validation/pal_allowedlist.txt +++ b/scripts/commit_validation/commit_validation/pal_allowedlist.txt @@ -35,7 +35,6 @@ */Code/Framework/AzCore/Tests/Memory.cpp */Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp */Code/Framework/AzQtComponents/AzQtComponents/* -*/Code/Framework/AzToolsFramework/AzToolsFramework/AzToolsFramework_precompiled.h */Code/Framework/AzToolsFramework/AzToolsFramework/API/EditorAssetSystemAPI.h */Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.cpp */Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp From 5e15d91d7624eca5543be76087221b83fb644d36 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 11:15:12 -0700 Subject: [PATCH 062/300] AssetMemoryAnalyzer Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/AssetMemoryAnalyzer.cpp | 1 - .../Code/Source/AssetMemoryAnalyzer.h | 3 +++ .../Code/Source/AssetMemoryAnalyzerModule.cpp | 2 +- .../Code/Source/AssetMemoryAnalyzerSystemComponent.cpp | 1 - .../Code/Source/AssetMemoryAnalyzer_precompiled.h | 9 --------- Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp | 1 - Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp | 1 - Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp | 1 - Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp | 1 - .../Code/Tests/AssetMemoryAnalyzerTest.cpp | 2 -- .../Code/assetmemoryanalyzer_files.cmake | 1 - 11 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp index 64bdd51f39..a8d9102ff1 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AssetMemoryAnalyzer_precompiled.h" #include "AssetMemoryAnalyzer.h" diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h index 810444d1bc..f550e1c7a5 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h +++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer.h @@ -8,6 +8,9 @@ #include #include +#include +#include +#include namespace AssetMemoryAnalyzer { diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp index 87443b04d6..65d2099a7f 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerModule.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AssetMemoryAnalyzer_precompiled.h" + #include #include diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp index f5ed2ec36d..83c01fa7ea 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzerSystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AssetMemoryAnalyzer_precompiled.h" #include #include // For AZ_MAX_PATH_LEN diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h b/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h deleted file mode 100644 index d424689241..0000000000 --- a/Gems/AssetMemoryAnalyzer/Code/Source/AssetMemoryAnalyzer_precompiled.h +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include // Many CryCommon files require that this is included first. diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp index 702dad5d18..f334bdd80c 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AssetMemoryAnalyzer_precompiled.h" #include "AssetMemoryAnalyzer.h" #include "AssetMemoryAnalyzerSystemComponent.h" diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp index c20d8b6cdc..9381e2ed59 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportCSV.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AssetMemoryAnalyzer_precompiled.h" #include "ExportCSV.h" diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp index d5d5bb7039..f37c18999c 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AssetMemoryAnalyzer_precompiled.h" #include "ExportJSON.h" diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp index ebfa5f0cf5..360e5953c7 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Source/FormatUtils.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "AssetMemoryAnalyzer_precompiled.h" #include "FormatUtils.h" diff --git a/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp b/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp index 001cfe130b..0e0cd62785 100644 --- a/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp +++ b/Gems/AssetMemoryAnalyzer/Code/Tests/AssetMemoryAnalyzerTest.cpp @@ -5,8 +5,6 @@ * */ -#include "AssetMemoryAnalyzer_precompiled.h" - #include #include #include diff --git a/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake index d7f50ce09b..68ad406753 100644 --- a/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake +++ b/Gems/AssetMemoryAnalyzer/Code/assetmemoryanalyzer_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/AssetMemoryAnalyzer_precompiled.h Include/AssetMemoryAnalyzer/AssetMemoryAnalyzerBus.h Source/AssetMemoryAnalyzer.cpp Source/AssetMemoryAnalyzer.h From 6b6bd1149d007330c30f3531737ef53178c2ccf0 Mon Sep 17 00:00:00 2001 From: onecent1101 Date: Mon, 12 Jul 2021 14:17:33 -0700 Subject: [PATCH 063/300] [SPEC-7510] Remove unnecessary static container for AWSCore scriptcanvas nodes Signed-off-by: onecent1101 --- .../ScriptCanvas/AWSScriptBehaviorBase.h | 42 ------------ .../ScriptCanvas/AWSScriptBehaviorDynamoDB.h | 10 +-- .../ScriptCanvas/AWSScriptBehaviorLambda.h | 10 +-- .../Public/ScriptCanvas/AWSScriptBehaviorS3.h | 10 +-- .../AWSScriptBehaviorsComponent.h | 16 ----- .../AWSScriptBehaviorDynamoDB.cpp | 43 +++++-------- .../ScriptCanvas/AWSScriptBehaviorLambda.cpp | 43 +++++-------- .../ScriptCanvas/AWSScriptBehaviorS3.cpp | 64 ++++++++----------- .../AWSScriptBehaviorsComponent.cpp | 56 +--------------- .../AWSScriptBehaviorsComponentTest.cpp | 28 ++------ Gems/AWSCore/Code/awscore_files.cmake | 1 - 11 files changed, 88 insertions(+), 235 deletions(-) delete mode 100644 Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h deleted file mode 100644 index 90163dd363..0000000000 --- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -namespace AZ -{ - class BehaviorContext; - class EditContext; - class SerializeContext; -} // namespace AZ - -// this just provides a convenient template to avoid the necessary boilerplate when you derive from AWSScriptBehaviorBase -#define AWS_SCRIPT_BEHAVIOR_DEFINITION(className, guidString) \ - AZ_TYPE_INFO(className, guidString) \ - AZ_CLASS_ALLOCATOR(className, AZ::SystemAllocator, 0) \ - void ReflectSerialization(AZ::SerializeContext* serializeContext) override; \ - void ReflectBehaviors(AZ::BehaviorContext* behaviorContext) override; \ - void ReflectEditParameters(AZ::EditContext* editContext) override; \ - className(); \ - -namespace AWSCore -{ - //! An interface for AWS ScriptCanvas Behaviors to inherit from - class AWSScriptBehaviorBase - { - public: - virtual ~AWSScriptBehaviorBase() = default; - - virtual void ReflectSerialization(AZ::SerializeContext* reflectContext) = 0; - virtual void ReflectBehaviors(AZ::BehaviorContext* behaviorContext) = 0; - virtual void ReflectEditParameters(AZ::EditContext* editContext) = 0; - - virtual void Init() {} - virtual void Activate() {} - virtual void Deactivate() {} - }; -} // namespace AWSCore diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h index 317d16dbe4..7244f57f6a 100644 --- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h +++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h @@ -10,8 +10,6 @@ #include #include -#include - namespace AWSCore { using DynamoDBAttributeValueMap = AZStd::unordered_map; @@ -55,10 +53,14 @@ namespace AWSCore }; class AWSScriptBehaviorDynamoDB - : public AWSScriptBehaviorBase { public: - AWS_SCRIPT_BEHAVIOR_DEFINITION(AWSScriptBehaviorDynamoDB, "{569E74F6-1268-4199-9653-A3B603FC9F4F}"); + AZ_RTTI(AWSScriptBehaviorDynamoDB, "{569E74F6-1268-4199-9653-A3B603FC9F4F}"); + + AWSScriptBehaviorDynamoDB() = default; + virtual ~AWSScriptBehaviorDynamoDB() = default; + + static void Reflect(AZ::ReflectContext* context); static void GetItem(const AZStd::string& tableResourceKey, const DynamoDBAttributeValueMap& keyMap); static void GetItemRaw(const AZStd::string& table, const DynamoDBAttributeValueMap& keyMap, const AZStd::string& region); diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h index a8a807e7fb..64601d8e59 100644 --- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h +++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h @@ -10,8 +10,6 @@ #include #include -#include - namespace AWSCore { //! AWS Script Behavior notifications for ScriptCanvas behaviors that interact with AWS Lambda @@ -53,10 +51,14 @@ namespace AWSCore }; class AWSScriptBehaviorLambda - : public AWSScriptBehaviorBase { public: - AWS_SCRIPT_BEHAVIOR_DEFINITION(AWSScriptBehaviorLambda, "{9E71534D-34B3-4723-B180-2552513DDA3D}"); + AZ_RTTI(AWSScriptBehaviorLambda, "{9E71534D-34B3-4723-B180-2552513DDA3D}"); + + AWSScriptBehaviorLambda() = default; + virtual ~AWSScriptBehaviorLambda() = default; + + static void Reflect(AZ::ReflectContext* context); static void Invoke(const AZStd::string& functionResourceKey, const AZStd::string& payload); static void InvokeRaw(const AZStd::string& functionName, const AZStd::string& payload, const AZStd::string& region); diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h index a75c3bce31..ac2df1c822 100644 --- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h +++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h @@ -10,8 +10,6 @@ #include #include -#include - namespace AWSCore { //! AWS Script Behavior notifications for ScriptCanvas behaviors that interact with AWS S3 @@ -68,7 +66,6 @@ namespace AWSCore }; class AWSScriptBehaviorS3 - : public AWSScriptBehaviorBase { static constexpr const char AWSScriptBehaviorS3Name[] = "AWSScriptBehaviorS3"; static constexpr const char OutputFileIsEmptyErrorMessage[] = "Request validation failed, output file is empty."; @@ -81,7 +78,12 @@ namespace AWSCore static constexpr const char RegionNameIsEmptyErrorMessage[] = "Request validation failed, region name is empty."; public: - AWS_SCRIPT_BEHAVIOR_DEFINITION(AWSScriptBehaviorS3, "{7F4E956C-7463-4236-B320-C992D36A9C6E}"); + AZ_RTTI(AWSScriptBehaviorS3, "{7F4E956C-7463-4236-B320-C992D36A9C6E}"); + + AWSScriptBehaviorS3() = default; + virtual ~AWSScriptBehaviorS3() = default; + + static void Reflect(AZ::ReflectContext* context); static void GetObject(const AZStd::string& bucketResourceKey, const AZStd::string& objectKey, const AZStd::string& outFile); static void GetObjectRaw(const AZStd::string& bucket, const AZStd::string& objectKey, const AZStd::string& region, const AZStd::string& outFile); diff --git a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h index 8958425615..43bd15d726 100644 --- a/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h +++ b/Gems/AWSCore/Code/Include/Public/ScriptCanvas/AWSScriptBehaviorsComponent.h @@ -10,7 +10,6 @@ #include #include #include -#include namespace AWSCore { @@ -30,23 +29,8 @@ namespace AWSCore static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent); - static bool AddedBehaviours() - { - return m_alreadyAddedBehaviors; - } - - protected: - - //////////////////////////////////////////////////////////////////////// // AZ::Component interface implementation - void Init() override; void Activate() override; void Deactivate() override; - //////////////////////////////////////////////////////////////////////// - - static void AddBehaviors(); // Add any behaviors you derived from AWSScriptBehaviorBase to the implementation of this function - - static AZStd::vector> m_behaviors; - static bool m_alreadyAddedBehaviors; }; } // namespace AWSCore diff --git a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp index c25df555fc..41c1aff34d 100644 --- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp +++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorDynamoDB.cpp @@ -20,39 +20,30 @@ namespace AWSCore { - AWSScriptBehaviorDynamoDB::AWSScriptBehaviorDynamoDB() + void AWSScriptBehaviorDynamoDB::Reflect(AZ::ReflectContext* context) { - } - - void AWSScriptBehaviorDynamoDB::ReflectSerialization(AZ::SerializeContext* serializeContext) - { - if (serializeContext) + if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) { serializeContext->Class() ->Version(0); } - } - - void AWSScriptBehaviorDynamoDB::ReflectBehaviors(AZ::BehaviorContext* behaviorContext) - { - behaviorContext->Class("AWSScriptBehaviorDynamoDB") - ->Attribute(AZ::Script::Attributes::Category, "AWSCore") - ->Method("GetItem", &AWSScriptBehaviorDynamoDB::GetItem, - {{{"Table Resource KeyName", "The name of the table containing the requested item."}, - {"Key Map", "A map of attribute names to AttributeValue objects, representing the primary key of the item to retrieve."}}}) - ->Method("GetItemRaw", &AWSScriptBehaviorDynamoDB::GetItemRaw, - {{{"Table Name", "The name of the table containing the requested item."}, - {"Key Map", "A map of attribute names to AttributeValue objects, representing the primary key of the item to retrieve."}, - {"Region Name", "The region of the table located in."}}}); - behaviorContext->EBus("AWSDynamoDBBehaviorNotificationBus") - ->Attribute(AZ::Script::Attributes::Category, "AWSCore") - ->Handler(); - } + if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) + { + behaviorContext->Class("AWSScriptBehaviorDynamoDB") + ->Attribute(AZ::Script::Attributes::Category, "AWSCore") + ->Method("GetItem", &AWSScriptBehaviorDynamoDB::GetItem, + {{{"Table Resource KeyName", "The name of the table containing the requested item."}, + {"Key Map", "A map of attribute names to AttributeValue objects, representing the primary key of the item to retrieve."}}}) + ->Method("GetItemRaw", &AWSScriptBehaviorDynamoDB::GetItemRaw, + {{{"Table Name", "The name of the table containing the requested item."}, + {"Key Map", "A map of attribute names to AttributeValue objects, representing the primary key of the item to retrieve."}, + {"Region Name", "The region of the table located in."}}}); - void AWSScriptBehaviorDynamoDB::ReflectEditParameters(AZ::EditContext* editContext) - { - AZ_UNUSED(editContext); + behaviorContext->EBus("AWSDynamoDBBehaviorNotificationBus") + ->Attribute(AZ::Script::Attributes::Category, "AWSCore") + ->Handler(); + } } void AWSScriptBehaviorDynamoDB::GetItem(const AZStd::string& tableResourceKey, const DynamoDBAttributeValueMap& keyMap) diff --git a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp index a7420654de..d4137c313b 100644 --- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp +++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorLambda.cpp @@ -21,39 +21,30 @@ namespace AWSCore { - AWSScriptBehaviorLambda::AWSScriptBehaviorLambda() + void AWSScriptBehaviorLambda::Reflect(AZ::ReflectContext* context) { - } - - void AWSScriptBehaviorLambda::ReflectSerialization(AZ::SerializeContext* serializeContext) - { - if (serializeContext) + if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) { serializeContext->Class() ->Version(0); } - } - - void AWSScriptBehaviorLambda::ReflectBehaviors(AZ::BehaviorContext* behaviorContext) - { - behaviorContext->Class("AWSScriptBehaviorLambda") - ->Attribute(AZ::Script::Attributes::Category, "AWSCore") - ->Method("Invoke", &AWSScriptBehaviorLambda::Invoke, - {{{"Function Resource KeyName", "The resource key name of the lambda function in resource mapping config file."}, - {"Payload", "The JSON that you want to provide to your Lambda function as input."}}}) - ->Method("InvokeRaw", &AWSScriptBehaviorLambda::InvokeRaw, - {{{"Function Name", "The name of the Lambda function, version, or alias."}, - {"Payload", "The JSON that you want to provide to your Lambda function as input."}, - {"Region Name", "The region of the lambda function located in."}}}); - behaviorContext->EBus("AWSLambdaBehaviorNotificationBus") - ->Attribute(AZ::Script::Attributes::Category, "AWSCore") - ->Handler(); - } + if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) + { + behaviorContext->Class("AWSScriptBehaviorLambda") + ->Attribute(AZ::Script::Attributes::Category, "AWSCore") + ->Method("Invoke", &AWSScriptBehaviorLambda::Invoke, + {{{"Function Resource KeyName", "The resource key name of the lambda function in resource mapping config file."}, + {"Payload", "The JSON that you want to provide to your Lambda function as input."}}}) + ->Method("InvokeRaw", &AWSScriptBehaviorLambda::InvokeRaw, + {{{"Function Name", "The name of the Lambda function, version, or alias."}, + {"Payload", "The JSON that you want to provide to your Lambda function as input."}, + {"Region Name", "The region of the lambda function located in."}}}); - void AWSScriptBehaviorLambda::ReflectEditParameters(AZ::EditContext* editContext) - { - AZ_UNUSED(editContext); + behaviorContext->EBus("AWSLambdaBehaviorNotificationBus") + ->Attribute(AZ::Script::Attributes::Category, "AWSCore") + ->Handler(); + } } void AWSScriptBehaviorLambda::Invoke(const AZStd::string& functionResourceKey, const AZStd::string& payload) diff --git a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp index f47dda8046..e82fff0c31 100644 --- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp +++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorS3.cpp @@ -24,49 +24,39 @@ namespace AWSCore { - AWSScriptBehaviorS3::AWSScriptBehaviorS3() + void AWSScriptBehaviorS3::Reflect(AZ::ReflectContext* context) { - } - - void AWSScriptBehaviorS3::ReflectSerialization(AZ::SerializeContext* serializeContext) - { - if (serializeContext) + if (AZ::SerializeContext* serializeContext = azrtti_cast(context)) { serializeContext->Class() ->Version(0); } - } - - void AWSScriptBehaviorS3::ReflectBehaviors(AZ::BehaviorContext* behaviorContext) - { - behaviorContext->Class(AWSScriptBehaviorS3Name) - ->Attribute(AZ::Script::Attributes::Category, "AWSCore") - ->Method("GetObject", &AWSScriptBehaviorS3::GetObject, - {{{"Bucket Resource KeyName", "The resource key name of the bucket in resource mapping config file."}, - {"Object KeyName", "The object key."}, - {"Outfile Name", "Filename where the content will be saved."}}}) - ->Method("GetObjectRaw", &AWSScriptBehaviorS3::GetObjectRaw, - {{{"Bucket Name", "The name of the bucket containing the object."}, - {"Object KeyName", "The object key."}, - {"Region Name", "The region of the bucket located in."}, - {"Outfile Name", "Filename where the content will be saved."}}}) - ->Method("HeadObject", &AWSScriptBehaviorS3::HeadObject, - {{{"Bucket Resource KeyName", "The resource key name of the bucket in resource mapping config file."}, - {"Object KeyName", "The object key."}}}) - ->Method("HeadObjectRaw", &AWSScriptBehaviorS3::HeadObjectRaw, - {{{"Bucket Name", "The name of the bucket containing the object."}, - {"Object KeyName", "The object key."}, - {"Region Name", "The region of the bucket located in."}}}) - ; - - behaviorContext->EBus("AWSS3BehaviorNotificationBus") - ->Attribute(AZ::Script::Attributes::Category, "AWSCore") - ->Handler(); - } - void AWSScriptBehaviorS3::ReflectEditParameters(AZ::EditContext* editContext) - { - AZ_UNUSED(editContext); + if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) + { + behaviorContext->Class(AWSScriptBehaviorS3Name) + ->Attribute(AZ::Script::Attributes::Category, "AWSCore") + ->Method("GetObject", &AWSScriptBehaviorS3::GetObject, + {{{"Bucket Resource KeyName", "The resource key name of the bucket in resource mapping config file."}, + {"Object KeyName", "The object key."}, + {"Outfile Name", "Filename where the content will be saved."}}}) + ->Method("GetObjectRaw", &AWSScriptBehaviorS3::GetObjectRaw, + {{{"Bucket Name", "The name of the bucket containing the object."}, + {"Object KeyName", "The object key."}, + {"Region Name", "The region of the bucket located in."}, + {"Outfile Name", "Filename where the content will be saved."}}}) + ->Method("HeadObject", &AWSScriptBehaviorS3::HeadObject, + {{{"Bucket Resource KeyName", "The resource key name of the bucket in resource mapping config file."}, + {"Object KeyName", "The object key."}}}) + ->Method("HeadObjectRaw", &AWSScriptBehaviorS3::HeadObjectRaw, + {{{"Bucket Name", "The name of the bucket containing the object."}, + {"Object KeyName", "The object key."}, + {"Region Name", "The region of the bucket located in."}}}); + + behaviorContext->EBus("AWSS3BehaviorNotificationBus") + ->Attribute(AZ::Script::Attributes::Category, "AWSCore") + ->Handler(); + } } void AWSScriptBehaviorS3::GetObject( diff --git a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp index 530c35cde2..4c41dc3f0e 100644 --- a/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp +++ b/Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp @@ -12,35 +12,17 @@ namespace AWSCore { - AZStd::vector> AWSScriptBehaviorsComponent::m_behaviors; - bool AWSScriptBehaviorsComponent::m_alreadyAddedBehaviors = false; - - void AWSScriptBehaviorsComponent::AddBehaviors() - { - if (!m_alreadyAddedBehaviors) - { - // Add new script behaviors here - m_behaviors.push_back(AZStd::make_unique()); - m_behaviors.push_back(AZStd::make_unique()); - m_behaviors.push_back(AZStd::make_unique()); - m_alreadyAddedBehaviors = true; - } - } - void AWSScriptBehaviorsComponent::Reflect(AZ::ReflectContext* context) { - AddBehaviors(); + AWSScriptBehaviorDynamoDB::Reflect(context); + AWSScriptBehaviorLambda::Reflect(context); + AWSScriptBehaviorS3::Reflect(context); if (AZ::SerializeContext* serialize = azrtti_cast(context)) { serialize->Class() ->Version(0); - for (auto&& behavior : m_behaviors) - { - behavior->ReflectSerialization(serialize); - } - if (AZ::EditContext* editContext = serialize->GetEditContext()) { editContext->Class("AWSScriptBehaviors", "Provides ScriptCanvas functions for calling AWS") @@ -49,19 +31,6 @@ namespace AWSCore ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("AWS")) ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ; - - for (auto&& behavior : m_behaviors) - { - behavior->ReflectEditParameters(editContext); - } - } - } - - if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) - { - for (auto&& behavior : m_behaviors) - { - behavior->ReflectBehaviors(behaviorContext); } } } @@ -86,31 +55,12 @@ namespace AWSCore AZ_UNUSED(dependent); } - void AWSScriptBehaviorsComponent::Init() - { - for (auto&& behavior : m_behaviors) - { - behavior->Init(); - } - } - void AWSScriptBehaviorsComponent::Activate() { - for (auto&& behavior : m_behaviors) - { - behavior->Activate(); - } } void AWSScriptBehaviorsComponent::Deactivate() { - for (auto&& behavior : m_behaviors) - { - behavior->Deactivate(); - } - - // this forces the vector to release its capacity, clear/shrink_to_fit is not - m_behaviors.swap(AZStd::vector>()); } } diff --git a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp index 15ad297f9b..2283caa69e 100644 --- a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp +++ b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp @@ -15,18 +15,6 @@ using namespace AWSCore; -class AWSScriptBehaviorsComponentMock - : public AWSScriptBehaviorsComponent -{ -public: - AZ_COMPONENT(AWSScriptBehaviorsComponentMock, "{78579706-E1B2-4788-A34D-A58D3F273FF9}"); - - int GetBehaviorsNum() - { - return m_behaviors.size(); - } -}; - class AWSScriptBehaviorsComponentTest : public UnitTest::ScopedAllocatorSetupFixture { @@ -38,7 +26,7 @@ public: m_behaviorContext = AZStd::make_unique(); m_entity = AZStd::make_unique(); - m_scriptBehaviorsComponent.reset(m_entity->CreateComponent()); + m_scriptBehaviorsComponent.reset(m_entity->CreateComponent()); } void TearDown() override @@ -56,20 +44,16 @@ protected: AZStd::unique_ptr m_serializeContext; AZStd::unique_ptr m_behaviorContext; AZStd::unique_ptr m_componentDescriptor; - AZStd::unique_ptr m_scriptBehaviorsComponent; + AZStd::unique_ptr m_scriptBehaviorsComponent; AZStd::unique_ptr m_entity; }; -TEST_F(AWSScriptBehaviorsComponentTest, InitActivateDeactivate_Call_GetExpectedNumOfAddedBehaviors) +TEST_F(AWSScriptBehaviorsComponentTest, Reflect) { - m_componentDescriptor.reset(AWSScriptBehaviorsComponentMock::CreateDescriptor()); + int oldEBusNum = m_behaviorContext->m_ebuses.size(); + m_componentDescriptor.reset(AWSScriptBehaviorsComponent::CreateDescriptor()); m_componentDescriptor->Reflect(m_serializeContext.get()); m_componentDescriptor->Reflect(m_behaviorContext.get()); - EXPECT_TRUE(AWSScriptBehaviorsComponentMock::AddedBehaviours()); - EXPECT_TRUE(m_scriptBehaviorsComponent->GetBehaviorsNum() == 3); - m_entity->Init(); - m_entity->Activate(); - m_entity->Deactivate(); - EXPECT_TRUE(m_scriptBehaviorsComponent->GetBehaviorsNum() == 0); + EXPECT_TRUE(m_behaviorContext->m_ebuses.size() - oldEBusNum == 3); } diff --git a/Gems/AWSCore/Code/awscore_files.cmake b/Gems/AWSCore/Code/awscore_files.cmake index c1577ec1eb..8e8ed280f8 100644 --- a/Gems/AWSCore/Code/awscore_files.cmake +++ b/Gems/AWSCore/Code/awscore_files.cmake @@ -32,7 +32,6 @@ set(FILES Include/Public/Framework/ServiceRequestJobConfig.h Include/Public/Framework/Util.h Include/Public/ResourceMapping/AWSResourceMappingBus.h - Include/Public/ScriptCanvas/AWSScriptBehaviorBase.h Include/Public/ScriptCanvas/AWSScriptBehaviorDynamoDB.h Include/Public/ScriptCanvas/AWSScriptBehaviorLambda.h Include/Public/ScriptCanvas/AWSScriptBehaviorS3.h From 89b13513ef4b551a8c762e7c3ae5074c36b613b0 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 12:41:45 -0700 Subject: [PATCH 064/300] ImageProcessingAtom Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Atom/ImageProcessing/PixelFormats.h | 1 + .../BuilderSettings/BuilderSettingManager.cpp | 1 - .../BuilderSettings/BuilderSettings.cpp | 1 - .../BuilderSettings/CubemapSettings.cpp | 1 - .../Source/BuilderSettings/MipmapSettings.cpp | 1 - .../Source/BuilderSettings/PresetSettings.cpp | 1 - .../BuilderSettings/TextureSettings.cpp | 1 - .../Code/Source/Compressors/CTSquisher.cpp | 1 - .../Code/Source/Compressors/Compressor.cpp | 1 - .../CryTextureSquisher/ColorBlockRGBA4x4c.cpp | 1 - .../CryTextureSquisher/ColorBlockRGBA4x4f.cpp | 1 - .../CryTextureSquisher/ColorBlockRGBA4x4s.cpp | 1 - .../CryTextureSquisher/ColorTypes.h | 3 +- .../CryTextureSquisher/CryTextureSquisher.cpp | 1 - .../Code/Source/Compressors/ETC2.cpp | 1 - .../Compressors/ISPCTextureCompressor.cpp | 1 - .../Code/Source/Compressors/PVRTC.cpp | 1 - .../Code/Source/Converters/AlphaCoverage.cpp | 1 - .../Code/Source/Converters/ColorChart.cpp | 1 - .../Source/Converters/ConvertPixelFormat.cpp | 1 - .../Code/Source/Converters/Cubemap.cpp | 1 - .../Code/Source/Converters/Cubemap.h | 2 ++ .../Code/Source/Converters/FIR-Filter.cpp | 1 - .../Code/Source/Converters/FIR-Weights.cpp | 4 +-- .../Code/Source/Converters/Gamma.cpp | 1 - .../Code/Source/Converters/HighPass.cpp | 1 - .../Code/Source/Converters/Histogram.cpp | 1 - .../Code/Source/Converters/Normalize.cpp | 1 - .../Code/Source/Converters/PixelOperation.cpp | 1 - .../Code/Source/Converters/PixelOperation.h | 1 + .../Code/Source/Editor/EditorCommon.cpp | 1 - .../Code/Source/Editor/ImagePopup.cpp | 1 - .../Source/Editor/MipmapSettingWidget.cpp | 1 - .../Code/Source/Editor/PresetInfoPopup.cpp | 1 - .../Editor/ResolutionSettingItemWidget.cpp | 1 - .../Source/Editor/ResolutionSettingWidget.cpp | 1 - .../Editor/TexturePresetSelectionWidget.cpp | 1 - .../Source/Editor/TexturePreviewWidget.cpp | 1 - .../Source/Editor/TexturePropertyEditor.cpp | 1 - .../Source/Editor/TexturePropertyEditor.h | 1 + .../Code/Source/ImageBuilderComponent.cpp | 1 - .../Code/Source/ImageLoader/DdsLoader.cpp | 1 - .../Code/Source/ImageLoader/ExrLoader.cpp | 1 - .../Code/Source/ImageLoader/ImageLoaders.cpp | 1 - .../Code/Source/ImageLoader/QtImageLoader.cpp | 2 +- .../Code/Source/ImageLoader/TIFFLoader.cpp | 1 - .../Code/Source/ImageProcessingModule.cpp | 1 - .../Source/ImageProcessingSystemComponent.cpp | 1 - .../Code/Source/ImageProcessing_precompiled.h | 29 ------------------- .../Code/Source/Previewer/ImagePreviewer.cpp | 3 +- .../Previewer/ImagePreviewerFactory.cpp | 2 +- .../Code/Source/Processing/DDSHeader.h | 2 ++ .../Source/Processing/ImageAssetProducer.cpp | 1 - .../Code/Source/Processing/ImageConvert.cpp | 6 ---- .../Code/Source/Processing/ImageConvert.h | 1 + .../Source/Processing/ImageConvertJob.cpp | 1 - .../Code/Source/Processing/ImageFlags.h | 2 ++ .../Source/Processing/ImageObjectImpl.cpp | 1 - .../Code/Source/Processing/ImagePreview.cpp | 3 +- .../Code/Source/Processing/ImageToProcess.h | 1 + .../Source/Processing/PixelFormatInfo.cpp | 1 - .../Code/Source/Processing/PixelFormatInfo.h | 2 ++ .../Code/Source/Processing/Utils.cpp | 1 - .../ImageThumbnailSystemComponent.cpp | 1 - .../Code/Tests/ImageProcessing_Test.cpp | 1 - .../Code/imageprocessing_files.cmake | 1 - .../External/CubeMapGen/CBBoxInt32.cpp | 1 - .../External/CubeMapGen/CBBoxInt32.h | 2 ++ .../External/CubeMapGen/CCubeMapProcessor.cpp | 1 - .../External/CubeMapGen/CImageSurface.cpp | 5 +--- .../External/CubeMapGen/CImageSurface.h | 2 +- 71 files changed, 24 insertions(+), 101 deletions(-) delete mode 100644 Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h index e2d8c7b8e3..22ac22fea0 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Include/Atom/ImageProcessing/PixelFormats.h @@ -6,6 +6,7 @@ */ #pragma once +#include namespace ImageProcessingAtom { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp index eb5f0a1629..2c562ddfdd 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettingManager.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include "BuilderSettingManager.h" #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp index b85ef41967..accf9fcb16 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/BuilderSettings.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "ImageProcessing_precompiled.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp index 262efd5a8e..da8c0f1d46 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/CubemapSettings.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp index c0c167476a..fbf39942e6 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/MipmapSettings.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp index 2b53fbd95f..7f2df2c081 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/PresetSettings.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp index f323ba29ee..3777f44ddc 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/BuilderSettings/TextureSettings.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp index d4b6a2b85a..f6ffeb6f1a 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CTSquisher.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp index 1f4dfb7ef8..00f23eedc4 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/Compressor.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp index f6461461a1..0891f32ff9 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4c.cpp @@ -6,7 +6,6 @@ */ -#include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp index 9ce7e9e897..ae7beacca9 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4f.cpp @@ -6,7 +6,6 @@ */ -#include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp index 8817c55572..f612a69558 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorBlockRGBA4x4s.cpp @@ -6,7 +6,6 @@ */ -#include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h index d6a1381e65..99135dbc39 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/ColorTypes.h @@ -5,9 +5,10 @@ * */ - #pragma once +#include + namespace ImageProcessingAtom { // 32 bit 8888 RGBA color diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp index 7e0161f519..bc6b515d8a 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp @@ -6,7 +6,6 @@ */ -#include #include #include "ColorBlockRGBA4x4c.h" #include "ColorBlockRGBA4x4s.h" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp index db2e0e8ea0..2e1ecbbd1f 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ETC2.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp index 22c87999aa..026454e7c1 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/ISPCTextureCompressor.cpp @@ -5,7 +5,6 @@ * */ -#include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp index a40bc5ca49..bd4c57cda8 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Compressors/PVRTC.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp index 01bb94ba76..b9085f3b90 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/AlphaCoverage.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp index ecd5328f06..d58cc1aa6e 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ColorChart.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp index 7585cbd97e..1b52b81644 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/ConvertPixelFormat.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp index bdb455ec04..2af889cc86 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h index 515216866a..2c8db46575 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Cubemap.h @@ -7,6 +7,8 @@ #pragma once +#include + namespace ImageProcessingAtom { // note: O3DE is right hand Z up coordinate diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp index 151c34197b..31807a4ad9 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Filter.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp index bec32a18c6..77a25cbb46 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/FIR-Weights.cpp @@ -5,11 +5,9 @@ * */ - -#include - #include #include "FIR-Weights.h" +#include /* #################################################################################################################### */ diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp index 6cd48a02c2..512e5785ca 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Gamma.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp index 263d94cf90..19a149b3f5 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/HighPass.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp index 3878b38263..1c1a296157 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Histogram.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp index 8ac39a8413..c9e44c532b 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/Normalize.cpp @@ -6,7 +6,6 @@ */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp index a73e145b54..4871edff75 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp @@ -5,7 +5,6 @@ * */ -#include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h index a20c5cbe76..663bb82dd7 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.h @@ -8,6 +8,7 @@ #pragma once #include +#include namespace ImageProcessingAtom { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp index ce23058fcc..740ef47c92 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp index 0fa1832cb6..a5c2a09e21 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ImagePopup.cpp @@ -5,7 +5,6 @@ * */ -#include #include "ImagePopup.h" AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp index 2b1e1a6e07..f257b91847 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/MipmapSettingWidget.cpp @@ -5,7 +5,6 @@ * */ -#include #include "MipmapSettingWidget.h" #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp index 32d461db46..67b373d07e 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/PresetInfoPopup.cpp @@ -5,7 +5,6 @@ * */ -#include #include "PresetInfoPopup.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp index 19a100d126..f3c58e42c0 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingItemWidget.cpp @@ -5,7 +5,6 @@ * */ -#include #include "ResolutionSettingItemWidget.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp index 14d2991fba..7a3481c2ad 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/ResolutionSettingWidget.cpp @@ -5,7 +5,6 @@ * */ -#include #include "ResolutionSettingWidget.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp index 0cbf1b996a..6f1a95ec66 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePresetSelectionWidget.cpp @@ -5,7 +5,6 @@ * */ -#include #include "TexturePresetSelectionWidget.h" #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp index 7adac7cdab..185e7ad486 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePreviewWidget.cpp @@ -5,7 +5,6 @@ * */ -#include #include "TexturePreviewWidget.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp index 0be72ce1d8..a46da5ec1b 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.cpp @@ -5,7 +5,6 @@ * */ -#include #include "TexturePropertyEditor.h" // warning C4251: 'QBrush::d': class 'QScopedPointer' needs to have dll-interface to be used by clients of class 'QBrush' diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h index 0e3c0bc201..c60262f5f4 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/TexturePropertyEditor.h @@ -8,6 +8,7 @@ #pragma once #if !defined(Q_MOC_RUN) +#include // warning C4251: 'QBrush::d': class 'QScopedPointer' needs to have dll-interface to be used by clients of class 'QBrush' // warning C4800: 'uint': forcing value to bool 'true' or 'false' (performance warning) AZ_PUSH_DISABLE_WARNING(4800 4251, "-Wunknown-warning-option") diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp index d24541eded..a8c990e4cf 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageBuilderComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp index c4c49c1d3b..985d034ff2 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/DdsLoader.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp index 47ee234ac7..c8c6ca6b28 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ExrLoader.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp index 889178121a..c18014b122 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/ImageLoaders.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp index 1fb2202d2a..2e0be40ca9 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/QtImageLoader.cpp @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "ImageProcessing_precompiled.h" #include #include +#include // warning C4251: class QT_Type needs to have dll-interface to be used by clients of class 'QT_Type' AZ_PUSH_DISABLE_WARNING(4251, "-Wunknown-warning-option") diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp index 2164723e93..fe22c06732 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageLoader/TIFFLoader.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp index 5164ab9733..c3bbd56673 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingModule.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include "ImageProcessingSystemComponent.h" #include "ImageBuilderComponent.h" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp index 2c84b409c7..08dd0d6538 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessingSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h deleted file mode 100644 index c2894ceffc..0000000000 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/ImageProcessing_precompiled.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -///////////////////////////////////////////////////////////////////////////// -// Qt -///////////////////////////////////////////////////////////////////////////// -#include -#include -#include - -///////////////////////////////////////////////////////////////////////////// -// AZCore -///////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include - -///////////////////////////////////////////////////////////////////////////// -//Type definitions -///////////////////////////////////////////////////////////////////////////// -#include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp index a1d69ac13c..2403d4374c 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewer.cpp @@ -4,10 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include +#include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT - #include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp index c2bb085609..118db25730 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Previewer/ImagePreviewerFactory.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include +#include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h index d39b02f2f6..d24a8eb6f9 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/DDSHeader.h @@ -6,9 +6,11 @@ */ #pragma once + #include #include #include +#include #define IMAGE_BUIDER_MAKEFOURCC(ch0, ch1, ch2, ch3) \ ((AZ::u32)(AZ::u8)(ch0) | ((AZ::u32)(AZ::u8)(ch1) << 8) | \ diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp index 87836d187c..4ec1824497 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageAssetProducer.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp index be98820442..f59e1aa34f 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.cpp @@ -5,8 +5,6 @@ * */ -#include - #include #include #include @@ -24,10 +22,6 @@ #include -// qt has convenience functions to handle file -#include -#include - // for texture splitting // minimum number of low level mips will be saved in the base file. #define MinPersistantMips 3 diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h index 649b9e5f9b..26f082ee34 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvert.h @@ -20,6 +20,7 @@ #include #include +#include namespace ImageProcessingAtom { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp index db9dc66e38..035b44fc8d 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageConvertJob.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h index 49f13bf17e..0953836cc3 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageFlags.h @@ -7,6 +7,8 @@ #pragma once +#include + namespace ImageProcessingAtom { // flags to propagate from the RC to the engine through GetImageFlags() diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp index 4d2911ca4f..c4b936f55c 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageObjectImpl.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp index edf4f26563..c692fe48dc 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImagePreview.cpp @@ -5,8 +5,7 @@ * */ -#include - +#include #include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h index 1f814b052a..f47efdb8d5 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/ImageToProcess.h @@ -10,6 +10,7 @@ #include #include #include +#include namespace ImageProcessingAtom { diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp index 60bada1449..96a45061c0 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h index f65bb98c53..47beb3fa91 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/PixelFormatInfo.h @@ -14,6 +14,8 @@ #include #include +#include + namespace ImageProcessingAtom { //The original implementation was from cryhalf's CryConvertFloatToHalf and CryConvertHalfToFloat function diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp index 0b1ed339aa..5071ae1c8a 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Processing/Utils.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp index 3fc6843d5e..0e169cbc32 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Thumbnail/ImageThumbnailSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "ImageProcessing_precompiled.h" #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp index d5434091f8..7c9cfb35a5 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp @@ -5,7 +5,6 @@ * */ -#include #include #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake index 157c99857a..95e31caeb8 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake +++ b/Gems/Atom/Asset/ImageProcessingAtom/Code/imageprocessing_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/ImageProcessing_precompiled.h Source/Compressors/CryTextureSquisher/CryTextureSquisher.cpp Source/Compressors/CryTextureSquisher/CryTextureSquisher.h Include/Atom/ImageProcessing/ImageProcessingBus.h diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp index 271013adef..805a25ce38 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.cpp @@ -8,7 +8,6 @@ //============================================================================= // Modified from original -#include #include "CBBoxInt32.h" diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h index 53f32f8cd5..bc259ec4be 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CBBoxInt32.h @@ -9,6 +9,8 @@ #pragma once +#include + namespace ImageProcessingAtom { //bounding box class with coords specified as int32 diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp index 8264003b0b..fa861c739a 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CCubeMapProcessor.cpp @@ -3,7 +3,6 @@ //============================================================================= // Modified from original -#include #include "CCubeMapProcessor.h" #include diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp index f7da8a3c4a..e25a63bc4e 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.cpp @@ -14,11 +14,8 @@ //-------------------------------------------------------------------------------------- // Modified from original -#include - #include "CImageSurface.h" - namespace ImageProcessingAtom { //-------------------------------------------------------------------------------------- @@ -275,7 +272,7 @@ namespace ImageProcessingAtom SAFE_DELETE_ARRAY(m_ImgData); //safe delete old image data - m_ImgData = new(std::nothrow) CP_ITYPE[m_Width * m_Height * m_NumChannels]; //assume tight data packing + m_ImgData = new CP_ITYPE[m_Width * m_Height * m_NumChannels]; //assume tight data packing if (!m_ImgData) { FatalError(L"Unable to allocate data for image in CImageSurface::Init."); diff --git a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h index 6ad8f68ebc..848cbd1dbe 100644 --- a/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h +++ b/Gems/Atom/Asset/ImageProcessingAtom/External/CubeMapGen/CImageSurface.h @@ -13,7 +13,7 @@ #include #include "VectorMacros.h" - +#include #ifndef WCHAR #define WCHAR wchar_t From 27c9ccaf56e6319bcf085f45e51a6682e7d5e354 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 13:07:12 -0700 Subject: [PATCH 065/300] Atom/RHI/DX12 Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Platform/Windows/RHI/Conversions_Windows.cpp | 1 - .../Code/Source/Platform/Windows/RHI/DX12_Windows.cpp | 1 - .../Source/Platform/Windows/RHI/Device_Windows.cpp | 3 ++- .../RHI/NsightAftermathGpuCrashTracker_Windows.cpp | 1 - .../Platform/Windows/RHI/NsightAftermath_Windows.cpp | 1 - .../Platform/Windows/RHI/PhysicalDevice_Windows.cpp | 1 - .../Platform/Windows/RHI/PhysicalDevice_Windows.h | 1 + .../Source/Platform/Windows/RHI/SwapChain_Windows.cpp | 1 - .../Platform/Windows/RHI/SystemComponent_Windows.cpp | 3 ++- .../Platform/Windows/RHI/WindowsVersionQuery.cpp | 3 ++- .../Source/Platform/Windows/RHI/WindowsVersionQuery.h | 2 ++ Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h | 1 + .../DX12/Code/Source/RHI/AliasingBarrierTracker.cpp | 1 - .../RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp | 1 - .../DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h | 11 ----------- Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp | 1 - .../DX12/Code/Source/RHI/BufferMemoryAllocator.cpp | 1 - .../RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp | 1 - .../Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h | 1 + .../Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h | 1 + Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp | 1 - .../RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h | 1 + Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp | 1 - .../RHI/DX12/Code/Source/RHI/DescriptorContext.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h | 1 + .../RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp | 1 - .../RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h | 1 + .../DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp | 1 - .../Code/Source/RHI/FrameGraphExecuteGroupBase.cpp | 1 - .../Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp | 1 - .../RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp | 1 - .../DX12/Code/Source/RHI/IndirectBufferSignature.cpp | 1 - .../DX12/Code/Source/RHI/IndirectBufferSignature.h | 1 + .../RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp | 1 - .../RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp | 3 ++- Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h | 1 + .../Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp | 1 - .../RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h | 1 + .../DX12/Code/Source/RHI/RayTracingPipelineState.cpp | 1 - .../DX12/Code/Source/RHI/RayTracingPipelineState.h | 1 + .../DX12/Code/Source/RHI/RayTracingShaderTable.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h | 1 + Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp | 1 - .../RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp | 1 - .../DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp | 1 - .../DX12/Code/Source/RHI/StagingMemoryAllocator.cpp | 1 - .../RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp | 2 -- Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp | 1 - Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h | 1 + .../Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp | 2 +- .../DX12/Code/Source/RHI/TransientAttachmentPool.cpp | 1 - .../Code/atom_rhi_dx12_private_common_files.cmake | 1 - 77 files changed, 24 insertions(+), 74 deletions(-) delete mode 100644 Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp index 0748b1707e..a148c935a0 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Conversions_Windows.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp index 9372b32ea1..61a4a24674 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/DX12_Windows.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp index 07ba90336f..6509fdf6a1 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/Device_Windows.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" + +#include #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp index 5d80372c10..bb2037333e 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermathGpuCrashTracker_Windows.cpp @@ -5,7 +5,6 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp index 5b9341d972..b5e32538c1 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/NsightAftermath_Windows.cpp @@ -5,7 +5,6 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp index 111920594e..f78510eb99 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.cpp @@ -5,7 +5,6 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h index c0916a84ee..9a54e44338 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/PhysicalDevice_Windows.h @@ -7,6 +7,7 @@ #pragma once #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp index 10678bafaa..86c8fa5cc3 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SwapChain_Windows.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp index 6e8657c1ca..4a41a21ece 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/SystemComponent_Windows.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" + +#include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp index ce5a25540f..d716279a0b 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.cpp @@ -4,8 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" + #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h index fc3773c4de..323d5b4419 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h +++ b/Gems/Atom/RHI/DX12/Code/Source/Platform/Windows/RHI/WindowsVersionQuery.h @@ -6,6 +6,8 @@ */ #pragma once +#include + namespace AZ { namespace DX12 diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp index f77bf7a2d0..7dd3321fd7 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h index 401d0675e9..a14fe0eba9 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasedHeap.h @@ -8,6 +8,7 @@ #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp index 1e63f15224..536891d4a8 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AliasingBarrierTracker.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp index 4fd8e06c32..84dfce65ce 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AsyncUploadQueue.cpp @@ -5,7 +5,6 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h deleted file mode 100644 index a032f59091..0000000000 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Atom_RHI_DX12_precompiled.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp index e1d48d91a6..f8b8c6ff77 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Buffer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp index 6ee2226867..e2858a922a 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp index 6365b77186..5b67f3e587 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferMemoryView.cpp @@ -5,7 +5,6 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp index bd13573c28..878d966616 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp index eb63acd23a..8004b02f5e 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/BufferView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp index 83ef4176b2..813fe2c66d 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp index 60c4707576..d46c9c59df 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h index 18ba901c5a..109f5a7844 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListBase.h @@ -10,6 +10,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp index 7c55207a24..65f11dbdaa 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h index c236975185..c9b2315f1e 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandListPool.h @@ -12,6 +12,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp index c63a04cf17..ef888c178a 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueue.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp index d35e355807..b62f15f12d 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandQueueContext.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp index 2e54844fc8..3c2eccc9f8 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h index 820c516f4e..3ff5cbaddd 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Conversions.h @@ -22,6 +22,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp index 3debd58d2a..72d79e284b 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DX12.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp index 5f16e2cc16..cf2a37eebb 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Descriptor.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp index fc86f38d26..d2a4373557 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorContext.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp index c5234fd515..f5edd1aa17 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/DescriptorPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp index 576060a500..7d8464047c 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp index 21a9add45b..44953a0399 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h index 751a44b695..b48ad79b70 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Fence.h @@ -11,6 +11,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp index 1917d8d199..cfdbc17b91 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.cpp @@ -5,7 +5,6 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h index b953a0c83a..2042f61649 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphCompiler.h @@ -9,6 +9,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp index b00bf4844f..8b09fce3bf 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp index 88bc162114..8783d9c477 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp index 995935ef7a..ed5ad07d31 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp index 51fa75afb8..91d120dab6 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/FrameGraphExecuter.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp index 48b41a3f99..cb4f45fa11 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Image.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp index 1ded607837..da076490ca 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImagePool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp index e57191a8a2..fa37b36ff0 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ImageView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp index 37bfbc9a54..d1dce03f7a 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h index b14ad9f70a..2d9ff589c3 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferSignature.h @@ -9,6 +9,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp index aa76435f1a..32ae1fce25 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/IndirectBufferWriter.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp index 2147afc695..c307371676 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryPageAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp index ab2bf1d802..fa55db00a9 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/MemoryView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp index 819d22cdaa..44503c4026 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Module.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" + +#include #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp index ebfe5ba4c9..129dadff3e 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h index 00a31411eb..d66ad6fb36 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLayout.h @@ -14,6 +14,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp index 9fe5d2cf55..b53a18a479 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineLibrary.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp index 9cb74af42a..c1a4ec1bbe 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/PipelineState.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp index 2ea51ada27..86a5de7e22 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Query.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp index 14ddbcddb5..5e18ea10a2 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp index 7a9e232abb..553636c814 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/QueryPoolResolver.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp index e104cacf48..0445e1a9f5 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h index a6e429569b..47c6a6125e 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingBlas.h @@ -9,6 +9,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp index 40862b9992..9760bd2a82 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h index def2b9e8e6..ca719c4351 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingPipelineState.h @@ -9,6 +9,7 @@ #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp index 83e7b70d40..69f7bfd1a9 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingShaderTable.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp index 99fc1e125a..69aec5a0ea 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h index 60db5e001d..a7f79ba845 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/RayTracingTlas.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp index 8fc42fd2be..eb01bb6b42 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Sampler.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp index 3c1a5b2136..7cd8db143d 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/Scope.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp index a1f15cc497..4819656a4c 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp index 71bc45b709..86e1008352 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp @@ -5,7 +5,6 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp index 2eb13c6ada..eccd14916b 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StagingMemoryAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp index 95746b3475..8424da0447 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/StreamingImagePool.cpp @@ -4,14 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include #include #include #include -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp index be8fcf3b38..f8e0ba766a 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h index 7fdebaf1cb..c59a6f4219 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SwapChain.h @@ -7,6 +7,7 @@ #pragma once #include +#include namespace AZ { diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp index 30a63fd266..d491dbf622 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/SystemComponent.cpp @@ -5,7 +5,7 @@ * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" +#include #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp index 48a90e9bfa..707b6251d4 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/TransientAttachmentPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "RHI/Atom_RHI_DX12_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake index 7f739e20a3..1e491ec428 100644 --- a/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake +++ b/Gems/Atom/RHI/DX12/Code/atom_rhi_dx12_private_common_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/RHI/Atom_RHI_DX12_precompiled.h Source/RHI/Buffer.cpp Source/RHI/Buffer.h Source/RHI/BufferPool.cpp From f7fc0764c8fef327837ae64a287f14f35655b58a Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 13:12:33 -0700 Subject: [PATCH 066/300] Atom/RHI/Metal Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp | 2 +- Gems/Atom/RHI/Metal/Code/CMakeLists.txt | 1 - .../RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h | 10 ---------- .../Common/Unimplemented/ModuleStub_Unimplemented.cpp | 1 - .../Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp | 1 - .../Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp | 1 - .../Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp | 1 - .../Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp | 1 - .../Metal/Code/Source/RHI/AliasingBarrierTracker.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp | 1 - .../RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp | 1 - .../Metal/Code/Source/RHI/BufferMemoryAllocator.cpp | 1 - .../RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp | 1 - .../RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp | 1 - .../Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp | 1 - .../Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp | 1 - .../RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp | 1 - .../Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp | 1 - .../Code/Source/RHI/FrameGraphExecuteGroupBase.cpp | 1 - .../Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp | 1 - .../RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp | 1 - .../RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp | 1 - .../RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp | 1 - .../RHI/Metal/Code/Source/RHI/MetalViewController.mm | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp | 1 - .../Metal/Code/Source/RHI/NullDescriptorManager.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp | 1 - .../Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp | 1 - .../RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp | 1 - .../Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp | 1 - .../RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp | 1 - .../Code/Source/RHI/StreamingImagePoolResolver.cpp | 1 - Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp | 1 - .../Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp | 1 - .../Metal/Code/Source/RHI/TransientAttachmentPool.cpp | 1 - .../RHI/Metal/Code/atom_rhi_metal_common_files.cmake | 10 ---------- 53 files changed, 1 insertion(+), 71 deletions(-) delete mode 100644 Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h delete mode 100644 Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp index 27b1a7e666..cb8b75bff8 100644 --- a/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp +++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/AttachmentImagePool.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "CryRenderOther_precompiled.h" + #include "AttachmentImagePool.h" #include "Conversions.h" #include "Image.h" diff --git a/Gems/Atom/RHI/Metal/Code/CMakeLists.txt b/Gems/Atom/RHI/Metal/Code/CMakeLists.txt index 2c6d659d3b..f938b61b21 100644 --- a/Gems/Atom/RHI/Metal/Code/CMakeLists.txt +++ b/Gems/Atom/RHI/Metal/Code/CMakeLists.txt @@ -71,7 +71,6 @@ ly_add_target( NAME Atom_RHI_Metal.Private.Static STATIC NAMESPACE Gem FILES_CMAKE - atom_rhi_metal_common_files.cmake atom_rhi_metal_private_common_files.cmake Source/Platform/${PAL_PLATFORM_NAME}/platform_private_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake PLATFORM_INCLUDE_FILES diff --git a/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h b/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h deleted file mode 100644 index 146b14f9b6..0000000000 --- a/Gems/Atom/RHI/Metal/Code/Source/Atom_RHI_Metal_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include -#include diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp index 44940989e7..c8901b32f7 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Metal_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp index d295dbdd92..e7e621af17 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Conversions_Mac.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp index de3bc23a11..15582962b6 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/Mac/RHI/Metal_RHI_Mac.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Metal_precompiled.h" #import #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp index a5233da500..ab3a45f698 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Conversions_iOS.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp index b7c309fba2..6cf2fbb7b5 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/Platform/iOS/RHI/Metal_RHI_iOS.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Metal_precompiled.h" #import #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp index 0e901107d2..402fad5ac7 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasedHeap.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp index 152d4195a5..acfbd4daba 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AliasingBarrierTracker.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp index 3db2092fcb..1d49c7111d 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ArgumentBuffer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp index 2641324486..86daa0aefc 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/AsyncUploadQueue.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp index 3b9c38a01b..fc07e9fdf5 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Buffer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp index be27964194..07f521078a 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp index fdde4eb4a8..b94c54d9b0 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferMemoryView.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Metal_precompiled.h" #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp index 498cf68015..77a3030d3c 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPool.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp index a9635701cc..0ea6196b7b 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferPoolResolver.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp index 7d9c9f567e..f95c94c7f1 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/BufferView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp index 451f6b96a6..1ef0831261 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandList.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp index 675a593bc8..0ad12f985d 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListBase.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp index f592a18358..0da6382031 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandListPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp index d8e1e98a23..e7407ece80 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/CommandQueue.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp index a48e5f5bbf..63e67dde95 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Conversions.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp index 5e23353b65..fff096eb8b 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Device.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp index ec290e5ad5..96f58a448d 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Fence.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp index 24b2eb688f..f51e1b4d8a 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphCompiler.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp index 8f052b1f0c..d6637726f6 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp index 270c01c562..01ffd57eed 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp index 4d2125ef3f..9d27d67bba 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp index 210e749509..7aa7e0ef1f 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/FrameGraphExecuter.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp index 2d0482256d..d5c33b76de 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Image.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp index dba6488a64..7280bf20cb 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp index e4ce093ce6..5ca4b5df3d 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImagePoolResolver.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp index 652f60e2fc..ebf4cf0631 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ImageView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp index 65004f4fea..9117a366b3 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MemoryPageAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp index 3478d033b4..ecdf7ad20a 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Metal.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm index cb07113b00..d973517290 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/MetalViewController.mm @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Metal_precompiled.h" #import #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp index 43b37599dd..9ceac76627 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Module.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp index 61316d25b8..eaec2fc989 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/NullDescriptorManager.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp index 6002d96cb2..7e7b49cf43 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLayout.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp index 4bc81407e9..a1a35990b6 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineLibrary.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp index 61068f66c9..df2b09fcfa 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/PipelineState.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp index 9d0fc00c55..c779080fbe 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Query.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp index c2ea8826bb..7342fa86a3 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/QueryPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp index bbd99b0fe0..3872783f22 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/Scope.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp index 20ac8c423e..462648f2df 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp index 65409d3fe0..3396b33246 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/ShaderResourceGroupPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp index 9659bfa641..2495722256 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp index 6e34584144..0f8825dec6 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/StreamingImagePoolResolver.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp index 31d23e5100..5c38fad5f0 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SwapChain.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp index 70dcddb651..4c6764ddd5 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/SystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp index 11e4c85956..34e0d7342c 100644 --- a/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp +++ b/Gems/Atom/RHI/Metal/Code/Source/RHI/TransientAttachmentPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Metal_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake b/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake deleted file mode 100644 index b584d3d25f..0000000000 --- a/Gems/Atom/RHI/Metal/Code/atom_rhi_metal_common_files.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -set(FILES - Source/Atom_RHI_Metal_precompiled.h -) From 18b1c7e1a9b03ec05cd6e256fee4deb205b9fa8a Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 13:39:18 -0700 Subject: [PATCH 067/300] Atom/RHI/Null Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/Atom/RHI/Null/Code/CMakeLists.txt | 1 - .../Common/Unimplemented/ModuleStub_Unimplemented.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp | 1 - .../RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp | 1 - .../RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp | 1 - .../Null/Code/Source/RHI/RayTracingPipelineState.cpp | 1 - .../RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp | 1 - .../RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp | 1 - .../Null/Code/Source/RHI/ShaderResourceGroupPool.cpp | 1 - .../RHI/Null/Code/Source/RHI/StreamingImagePool.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp | 1 - Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp | 1 - .../Null/Code/Source/RHI/TransientAttachmentPool.cpp | 1 - .../RHI/Null/Code/atom_rhi_null_common_files.cmake | 10 ---------- 32 files changed, 41 deletions(-) delete mode 100644 Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake diff --git a/Gems/Atom/RHI/Null/Code/CMakeLists.txt b/Gems/Atom/RHI/Null/Code/CMakeLists.txt index 93bb328dfc..056dc55a05 100644 --- a/Gems/Atom/RHI/Null/Code/CMakeLists.txt +++ b/Gems/Atom/RHI/Null/Code/CMakeLists.txt @@ -28,7 +28,6 @@ ly_add_target( NAME Atom_RHI_Null.Private.Static STATIC NAMESPACE Gem FILES_CMAKE - atom_rhi_null_common_files.cmake atom_rhi_null_private_common_files.cmake INCLUDE_DIRECTORIES PRIVATE diff --git a/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp b/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp index 30bb1b60ac..6843f99619 100644 --- a/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/Platform/Common/Unimplemented/ModuleStub_Unimplemented.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp index b834f0214a..ca3ebb4945 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/AliasedHeap.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp index a1fc7f91c1..9668e21915 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Buffer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp index f9d3444286..81a607adf6 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferPool.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp index bc2874c9e3..6078c95d27 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/BufferView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp index 3b1aa99d90..515c546b7e 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandList.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp index 0a3876c1ad..4ae02ca316 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/CommandQueue.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp index 561b352916..a54a219b72 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Device.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp index a347958b7c..397556aa29 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphCompiler.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp index 7f190bede0..1025fbbb42 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/FrameGraphExecuter.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp index 76e21a642d..e5add9029e 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Image.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp index ebcaf66dca..cd79fce90f 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ImagePool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp index 1c0fcd3077..ae47e594e6 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ImageView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp index 2589444f68..d4dd640170 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Module.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp index b1f04db9fe..b171afdc2a 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PhysicalDevice.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp index 66c65b253c..9927c0150a 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineLibrary.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp index ae7518674b..c81ed18e66 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/PipelineState.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp index 1cbead32c0..9d86385838 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Query.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp index 211a6da47e..1ef4f3d846 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/QueryPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp index 2cebc98090..0761fde4db 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingBlas.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp index dbb903e047..17a976f69f 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingPipelineState.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp index 3ec7fcf432..e068231be7 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingShaderTable.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp index 1f1dc9b356..c7bfc1d971 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/RayTracingTlas.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp index 8e2848e413..4ea26c41ad 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/Scope.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp index dd82c49cb6..4380191081 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp index a1b8ba9096..8c9315f22d 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/ShaderResourceGroupPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp index d2a36c0006..ab215b3609 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/StreamingImagePool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp index 2b70c08138..5eb05fd188 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/SwapChain.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp index 83b06d1650..1b0492e4a2 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/SystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp index c7f323edd3..ce3814175e 100644 --- a/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp +++ b/Gems/Atom/RHI/Null/Code/Source/RHI/TransientAttachmentPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Null_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake b/Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake deleted file mode 100644 index a7f2830358..0000000000 --- a/Gems/Atom/RHI/Null/Code/atom_rhi_null_common_files.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -set(FILES - Source/Atom_RHI_Null_precompiled.h -) From f07d00df658d62c55cab34093d421352cd903444 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 13:39:46 -0700 Subject: [PATCH 068/300] Atom/RHI/Vulkan Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt | 1 - .../Code/Include/Atom/RHI.Loader/FunctionLoader.h | 2 ++ .../Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h | 10 ---------- .../Source/Platform/Android/RHI/WSISurface_Android.cpp | 1 - .../Source/Platform/Linux/RHI/WSISurface_Linux.cpp | 1 - .../Source/Platform/Windows/RHI/WSISurface_Windows.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp | 1 - .../Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp | 1 - .../Code/Source/RHI/BufferMemoryPageAllocator.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h | 1 + Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp | 1 - .../Vulkan/Code/Source/RHI/CommandListAllocator.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp | 1 - .../Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp | 1 - .../Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp | 1 - .../Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp | 1 - .../Code/Source/RHI/FrameGraphExecuteGroupBase.cpp | 1 - .../Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp | 1 - .../Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp | 1 - .../Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp | 1 - .../Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp | 1 - .../Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp | 3 ++- .../Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h | 1 + .../RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp | 1 - .../Code/Source/RHI/MergedShaderResourceGroup.cpp | 1 - .../Code/Source/RHI/MergedShaderResourceGroupPool.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp | 1 - .../Vulkan/Code/Source/RHI/NullDescriptorManager.cpp | 1 - .../Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp | 1 - .../Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp | 1 - .../Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h | 1 + .../RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp | 1 - .../Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp | 1 - .../Vulkan/Code/Source/RHI/RayTracingPipelineState.h | 1 + .../Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp | 1 - .../Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h | 1 + Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h | 1 + .../RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h | 2 ++ Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h | 1 + .../RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp | 1 - .../Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp | 1 - .../Code/Source/RHI/StreamingImagePoolResolver.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp | 1 - .../RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp | 1 - .../Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp | 1 - Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h | 1 + .../RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake | 10 ---------- 91 files changed, 14 insertions(+), 99 deletions(-) delete mode 100644 Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h delete mode 100644 Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake diff --git a/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt index 3a57f96772..a862617740 100644 --- a/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt +++ b/Gems/Atom/RHI/Vulkan/Code/CMakeLists.txt @@ -66,7 +66,6 @@ ly_add_target( NAME Atom_RHI_Vulkan.Reflect STATIC NAMESPACE Gem FILES_CMAKE - atom_rhi_vulkan_common_files.cmake atom_rhi_vulkan_reflect_common_files.cmake ${pal_source_dir}/platform_reflect_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake INCLUDE_DIRECTORIES diff --git a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h index 8a40b0e73b..70e485384b 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h +++ b/Gems/Atom/RHI/Vulkan/Code/Include/Atom/RHI.Loader/FunctionLoader.h @@ -6,6 +6,8 @@ */ #pragma once + +#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h b/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h deleted file mode 100644 index 5deff32444..0000000000 --- a/Gems/Atom/RHI/Vulkan/Code/Source/Atom_RHI_Vulkan_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include -#include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp index 1dec884fd0..422b8d1b1c 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Android/RHI/WSISurface_Android.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp index 0d9019a689..2dc5c1e918 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Linux/RHI/WSISurface_Linux.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp index ade7241987..361453f8b6 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/Platform/Windows/RHI/WSISurface_Windows.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp index 5c46b2f55a..dc1d84197e 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasedHeap.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp index e575f08ed6..108838526f 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AliasingBarrierTracker.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp index f0824cd3aa..c380d45ff6 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/AsyncUploadQueue.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp index 2dc32d0149..a60a3c6174 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Buffer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp index a4683512fc..9fbf0ecf55 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemory.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp index 11740621a8..b17a9acb14 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferMemoryPageAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp index 69118beffe..abce936c4b 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp index 112f90f72a..a42b5c5cd6 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferPoolResolver.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp index 6b1ed57903..752bbae640 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h index ff249ba676..e44f41ce22 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/BufferView.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp index cc89249072..5070f50523 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandList.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp index b0f78f559c..90205b27e3 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandListAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp index 1a6ce942b9..09c4b3278a 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp index c19e1dc183..d6d7cdf540 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueue.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp index 0b16223c81..63ac8ef40c 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/CommandQueueContext.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp index d7df4b1044..727cf53d29 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ComputePipeline.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp index 3144e5635f..c22ab5031a 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Conversion.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp index 70f950bcc8..cb92af4f5a 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp index 23bc2fa523..0857b5990a 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSet.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp index 9ab271303a..df63581418 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp index 67b5ed4487..6a49976162 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/DescriptorSetLayout.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp index 8aaffaab41..40ee7dd0c3 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Device.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp index a183a6b463..18701a9ecf 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Fence.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp index cf618fd2de..9920674dfb 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphCompiler.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp index f5fa6e792e..5643fd91a3 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp index 9ce9da9752..25604d59cf 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupBase.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp index a69b99dc22..51e13f1d06 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandler.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp index 85381d77f5..126ed34aac 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupHandlerBase.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp index cef60103c4..73b68d94eb 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMerged.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp index bd8776b2ea..5520eee895 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuteGroupMergedHandler.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp index 9c2a0f4002..b2f7a1d53f 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/FrameGraphExecuter.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp index 7cdd35ee60..165a799584 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Framebuffer.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp index 88a02f90c7..1247f0d2eb 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/GraphicsPipeline.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp index 7586183b63..acff709705 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Image.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp index 928247346d..c0ab2eb9f2 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePool.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp index 88c5602e7f..6655fcc419 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImagePoolResolver.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp index aa3c77c261..eed5ad95ba 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ImageView.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp index d8e05be10a..0dda1eb44c 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferSignature.cpp @@ -4,7 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" + +#include #include namespace AZ diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp index 43a3d19805..2bf41e546b 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/IndirectBufferWriter.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp index a98aad801a..70a4a02a39 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Instance.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp index b7864e3bbe..f1f1419160 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h index 4fb24125f6..b795b26ddb 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Memory.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp index c16f28af27..ac8522ad6e 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MemoryPageAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp index f11d0ed124..f2e0f52a20 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp index 8079bd10bf..68899f9c60 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/MergedShaderResourceGroupPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp index bfc0ec79dc..fc370853d4 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Module.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp index 4aba0f6860..2102c730b2 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/NullDescriptorManager.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp index 52aabdec1d..72f2833ae0 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PhysicalDevice.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp index d48dec6eee..e0f4be7b80 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Pipeline.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp index fb9cd8e4f1..b346eb3900 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLayout.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp index 79958c6dd2..f5a2a5d110 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineLibrary.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp index 0a3c11d4ba..e1967ac45f 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/PipelineState.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp index 8b1aca881d..a01d623add 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Query.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp index 555577bbfe..b4e6a45669 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/QueryPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp index bfa5d8dbe0..e93999d233 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Queue.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp index 719c7fc16a..8989599cdd 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h index ce59c7f2c8..4d31676e1e 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingBlas.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp index 5894d3fdd5..8fc958e8a8 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipeline.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp index 4dffc5c3da..efaebf4b6b 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h index 8bac2d57b4..b55262edc6 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp index b6cd3fe04d..960520cf66 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingShaderTable.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp index ac43ab0589..eb2db7658e 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h index c570eba572..3c15ef84a3 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingTlas.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp index c66f2467a9..6b5b7f0591 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h index 5e30a0d23f..26e294ab54 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPass.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp index 403c6fec7a..0506e6c585 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RenderPassBuilder.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp index 2461ad183c..54f624382b 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h index 487d7b7b55..9d260bb743 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Sampler.h @@ -5,6 +5,8 @@ * */ #pragma once + +#include #include namespace AZ diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp index 0189b6d325..7a9242e96c 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Scope.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp index 60137d0436..a4d9231264 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h index 347a523376..acedd66eef 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Semaphore.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp index 9e3dfbbdc2..f4f703c2ed 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SemaphoreAllocator.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp index ffc04b99ff..227b5cd1e8 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderModule.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp index 527fbf3858..7d0d7565a8 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroup.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp index 4871b7027d..01f7516044 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/ShaderResourceGroupPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp index e009f1d29a..eb0ac15c0f 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SignalEvent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include namespace AZ diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp index 613e280f98..b401b2291f 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePool.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp index 3c72b860d9..59e600bac7 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/StreamingImagePoolResolver.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp index d356d61cef..d887d98f58 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SwapChain.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp index 89e062fb20..ab8a6cbc32 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/SystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp index b659dd60af..9f75e633ea 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/TransientAttachmentPool.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp index acb0a33a24..94715aa0c3 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/Vulkan.cpp @@ -5,7 +5,6 @@ * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp index 16f170226b..3a5359e461 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Atom_RHI_Vulkan_precompiled.h" #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h index 79053ddb40..11a3ab1215 100644 --- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h +++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/WSISurface.h @@ -6,6 +6,7 @@ */ #pragma once +#include #include #include diff --git a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake b/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake deleted file mode 100644 index 8bd07760e0..0000000000 --- a/Gems/Atom/RHI/Vulkan/Code/atom_rhi_vulkan_common_files.cmake +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -set(FILES - Source/Atom_RHI_Vulkan_precompiled.h -) From 6ce0874295a0576cde110e1819ba31b357a1db51 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:03:51 -0700 Subject: [PATCH 069/300] AtomLyIntegration Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../AtomLyIntegration/AtomFont/AtomFont.h | 1 + .../AtomFont/AtomFont_precompiled.h | 29 ------------------- .../AtomLyIntegration/AtomFont/AtomNullFont.h | 2 +- .../AtomLyIntegration/AtomFont/FFont.h | 2 ++ .../AtomLyIntegration/AtomFont/GlyphBitmap.h | 2 ++ .../Platform/Common/FontTexture_Common.cpp | 1 - .../Platform/Windows/FontTexture_Windows.cpp | 1 - .../AtomFont/Code/Source/AtomFont.cpp | 1 - .../Code/Source/AtomFontSystemComponent.cpp | 7 +++-- .../AtomFont/Code/Source/AtomNullFont.cpp | 2 +- .../AtomFont/Code/Source/FFont.cpp | 1 - .../AtomFont/Code/Source/FFontXML.cpp | 1 - .../AtomFont/Code/Source/FFontXML_Internal.h | 1 - .../AtomFont/Code/Source/FontRenderer.cpp | 1 - .../AtomFont/Code/Source/FontTexture.cpp | 1 - .../AtomFont/Code/Source/GlyphBitmap.cpp | 3 +- .../AtomFont/Code/Source/GlyphCache.cpp | 1 - .../AtomFont/Code/atomfont_files.cmake | 1 - 18 files changed, 12 insertions(+), 46 deletions(-) delete mode 100644 Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h index 9e6c38a939..b3a5133dbf 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h +++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont.h @@ -13,6 +13,7 @@ #include #include +#include #include #include #include diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h deleted file mode 100644 index 7cb971f9e0..0000000000 --- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - - -#pragma once - -#include - -#define ATOMFONT_EXPORTS - -#include - -#include - -#include -#include -#include -#include - -#define USE_NULLFONT - -#if defined(DEDICATED_SERVER) -#define USE_NULLFONT_ALWAYS 1 -#endif - diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h index e6fd6785eb..708622f684 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h +++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/AtomNullFont.h @@ -8,9 +8,9 @@ // Description : Dummy font implementation (dedicated server) - #pragma once +#define USE_NULLFONT #if defined(USE_NULLFONT) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h index 4c9f5b283b..3146dcd42e 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h +++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/FFont.h @@ -18,6 +18,8 @@ #include #include #include +#include +#include #include "AtomFont.h" #include diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h index d1507ed7aa..072f159f3f 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h +++ b/Gems/AtomLyIntegration/AtomFont/Code/Include/AtomLyIntegration/AtomFont/GlyphBitmap.h @@ -13,6 +13,8 @@ #include #include +class ICrySizer; + namespace AZ { class GlyphBitmap diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp index 6d0999c3d3..abc7e53cff 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Common/FontTexture_Common.cpp @@ -5,7 +5,6 @@ * */ -#include #if !defined(USE_NULLFONT_ALWAYS) #include diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp index 3f2c73d741..11305911ed 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Platform/Windows/FontTexture_Windows.cpp @@ -5,7 +5,6 @@ * */ -#include #if !defined(USE_NULLFONT_ALWAYS) #include diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp index cb157b95f6..1f3688f527 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFont.cpp @@ -9,7 +9,6 @@ // Description : AtomFont class. -#include #if !defined(USE_NULLFONT_ALWAYS) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp index a33ed4b682..e7d6964a50 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp @@ -5,7 +5,8 @@ * */ -#include +#define USE_NULLFONT + #include "AtomFontSystemComponent.h" #include @@ -95,8 +96,8 @@ namespace AZ #else // The NULL font implementation must be present for all platforms // supporting running as a pure dedicated server. - system->GetILog()->LogError("Missing NULL font implementation for dedicated server"); - env.pCryFont = NULL; + system.GetILog()->LogError("Missing NULL font implementation for dedicated server"); + gEnv->pCryFont = NULL; #endif } else diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp index a317fe2d22..032f4852ba 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/AtomNullFont.cpp @@ -8,7 +8,7 @@ // Description : Dummy font implementation (dedicated server) -#include +#define USE_NULLFONT #if defined(USE_NULLFONT) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp index 50b0adf294..a3a423de11 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFont.cpp @@ -9,7 +9,6 @@ // Description : Font class. -#include #if !defined(USE_NULLFONT_ALWAYS) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp index 8797389fee..870d5f95b8 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML.cpp @@ -9,7 +9,6 @@ // Description : XML parsing to load a font. -#include #if !defined(USE_NULLFONT_ALWAYS) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h index 1e1597a083..2e081a36e1 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FFontXML_Internal.h @@ -8,7 +8,6 @@ #pragma once -#include #if !defined(USE_NULLFONT_ALWAYS) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp index f22fe4c0bb..d1fe2d996c 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontRenderer.cpp @@ -10,7 +10,6 @@ // Purpose: // - Render a glyph outline into a bitmap using FreeType 2 -#include #if !defined(USE_NULLFONT_ALWAYS) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp index 0665cc8524..48d5ba0a65 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/FontTexture.cpp @@ -9,7 +9,6 @@ // Purpose: // - Create and update a texture with the most recently used glyphs -#include #if !defined(USE_NULLFONT_ALWAYS) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp index 35b5b3e308..1a71102f1c 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphBitmap.cpp @@ -9,10 +9,9 @@ // Purpose: // - Hold a glyph bitmap and blit it to the main texture -#include #include #include - +#include //------------------------------------------------------------------------------------------------- AZ::GlyphBitmap::GlyphBitmap() diff --git a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp index 500afdc37e..6b75c15fed 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp +++ b/Gems/AtomLyIntegration/AtomFont/Code/Source/GlyphCache.cpp @@ -9,7 +9,6 @@ // Purpose: // - Manage and cache glyphs, retrieving them from the renderer as needed -#include #if !defined(USE_NULLFONT_ALWAYS) diff --git a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake index 28f23813e6..5aed8b23d1 100644 --- a/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake +++ b/Gems/AtomLyIntegration/AtomFont/Code/atomfont_files.cmake @@ -28,5 +28,4 @@ set(FILES Include/AtomLyIntegration/AtomFont/GlyphCache.h Include/AtomLyIntegration/AtomFont/AtomNullFont.h Include/AtomLyIntegration/AtomFont/resource.h - Include/AtomLyIntegration/AtomFont/AtomFont_precompiled.h ) From cef4e5278d4e1679edf312ab507c82a79dadf4c5 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:06:01 -0700 Subject: [PATCH 070/300] Gems/Camera Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/Camera/Code/Source/CameraComponent.cpp | 1 - .../Code/Source/CameraComponentConverter.cpp | 1 - .../Source/CameraEditorSystemComponent.cpp | 1 - Gems/Camera/Code/Source/CameraGem.cpp | 1 - Gems/Camera/Code/Source/Camera_precompiled.h | 35 ------------------- .../Code/Source/EditorCameraComponent.cpp | 1 - .../Source/ViewportCameraSelectorWindow.cpp | 1 - .../Camera/Code/Tests/CameraEditorUITests.cpp | 1 - Gems/Camera/Code/camera_files.cmake | 1 - .../Translation/GraphToCPlusPlus.cpp | 1 - 10 files changed, 44 deletions(-) delete mode 100644 Gems/Camera/Code/Source/Camera_precompiled.h diff --git a/Gems/Camera/Code/Source/CameraComponent.cpp b/Gems/Camera/Code/Source/CameraComponent.cpp index 81f7802004..afcc459b23 100644 --- a/Gems/Camera/Code/Source/CameraComponent.cpp +++ b/Gems/Camera/Code/Source/CameraComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Camera_precompiled.h" #include #include #include diff --git a/Gems/Camera/Code/Source/CameraComponentConverter.cpp b/Gems/Camera/Code/Source/CameraComponentConverter.cpp index 1be286e58a..e35234e923 100644 --- a/Gems/Camera/Code/Source/CameraComponentConverter.cpp +++ b/Gems/Camera/Code/Source/CameraComponentConverter.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Camera_precompiled.h" #include #if defined(CAMERA_EDITOR) diff --git a/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp index 27a732adc6..34a7269d08 100644 --- a/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp +++ b/Gems/Camera/Code/Source/CameraEditorSystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Camera_precompiled.h" #include "CameraEditorSystemComponent.h" #include "EditorCameraComponent.h" diff --git a/Gems/Camera/Code/Source/CameraGem.cpp b/Gems/Camera/Code/Source/CameraGem.cpp index 44650988c7..ddcd17bdd5 100644 --- a/Gems/Camera/Code/Source/CameraGem.cpp +++ b/Gems/Camera/Code/Source/CameraGem.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Camera_precompiled.h" #include #include diff --git a/Gems/Camera/Code/Source/Camera_precompiled.h b/Gems/Camera/Code/Source/Camera_precompiled.h deleted file mode 100644 index 707737d1bd..0000000000 --- a/Gems/Camera/Code/Source/Camera_precompiled.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once -#if defined(CAMERA_EDITOR) - -#include - -///////////////////////////////////////////////////////////////////////////// -// Engine -///////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include - -///////////////////////////////////////////////////////////////////////////// -// Editor -///////////////////////////////////////////////////////////////////////////// -#include -#include - -///////////////////////////////////////////////////////////////////////////// -// STL -///////////////////////////////////////////////////////////////////////////// -#include -#include -#include -#include -#include - -#endif // defined(CAMERA_EDITOR) diff --git a/Gems/Camera/Code/Source/EditorCameraComponent.cpp b/Gems/Camera/Code/Source/EditorCameraComponent.cpp index 255db33153..3e69fa08a1 100644 --- a/Gems/Camera/Code/Source/EditorCameraComponent.cpp +++ b/Gems/Camera/Code/Source/EditorCameraComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Camera_precompiled.h" #include #include #include diff --git a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp index 5dcdd9f111..43ab5bee0e 100644 --- a/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp +++ b/Gems/Camera/Code/Source/ViewportCameraSelectorWindow.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Camera_precompiled.h" #include "ViewportCameraSelectorWindow.h" #include "ViewportCameraSelectorWindow_Internals.h" #include diff --git a/Gems/Camera/Code/Tests/CameraEditorUITests.cpp b/Gems/Camera/Code/Tests/CameraEditorUITests.cpp index 191c05c8e9..27f45fb130 100644 --- a/Gems/Camera/Code/Tests/CameraEditorUITests.cpp +++ b/Gems/Camera/Code/Tests/CameraEditorUITests.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Camera_precompiled.h" #include #include diff --git a/Gems/Camera/Code/camera_files.cmake b/Gems/Camera/Code/camera_files.cmake index 85179aa686..5e0e53b757 100644 --- a/Gems/Camera/Code/camera_files.cmake +++ b/Gems/Camera/Code/camera_files.cmake @@ -12,5 +12,4 @@ set(FILES camera_files.cmake Source/CameraComponentController.cpp Source/CameraComponentController.h Source/CameraViewRegistrationBus.h - Source/Camera_precompiled.h ) diff --git a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp index ea33f1639e..f60b7b4ab3 100644 --- a/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp +++ b/Gems/ScriptCanvas/Code/Include/ScriptCanvas/Translation/GraphToCPlusPlus.cpp @@ -180,7 +180,6 @@ namespace ScriptCanvas m_dotCPP.WriteNewLine(); WriteDoNotModify(m_dotCPP); m_dotCPP.WriteNewLine(); - m_dotCPP.WriteLine("#include \"precompiled.h\""); m_dotCPP.WriteLine("#include \"%s.h\"", GetGraphName().data()); m_dotCPP.WriteNewLine(); } From 4ff1a4a58ead13f59887ae1337adcdc666e579aa Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:12:10 -0700 Subject: [PATCH 071/300] Gems/CameraFramework Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../CameraFramework/Code/Source/CameraFrameworkGem.cpp | 2 -- .../Code/Source/CameraFramework_precompiled.h | 10 ---------- .../CameraFramework/Code/Source/CameraRigComponent.cpp | 2 +- Gems/CameraFramework/Code/cameraframework_files.cmake | 1 - 4 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h diff --git a/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp b/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp index fe837db76f..81d218ef1d 100644 --- a/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp +++ b/Gems/CameraFramework/Code/Source/CameraFrameworkGem.cpp @@ -5,8 +5,6 @@ * */ -#include "CameraFramework_precompiled.h" - #include "CameraRigComponent.h" #include diff --git a/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h b/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h deleted file mode 100644 index 10305b3c2f..0000000000 --- a/Gems/CameraFramework/Code/Source/CameraFramework_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include diff --git a/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp b/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp index b52f1b9340..7630e545b1 100644 --- a/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp +++ b/Gems/CameraFramework/Code/Source/CameraRigComponent.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "CameraFramework_precompiled.h" + #include "CameraRigComponent.h" #include #include diff --git a/Gems/CameraFramework/Code/cameraframework_files.cmake b/Gems/CameraFramework/Code/cameraframework_files.cmake index 071adff0e1..82e8075bd6 100644 --- a/Gems/CameraFramework/Code/cameraframework_files.cmake +++ b/Gems/CameraFramework/Code/cameraframework_files.cmake @@ -12,5 +12,4 @@ set(FILES Include/CameraFramework/ICameraTransformBehavior.h Source/CameraRigComponent.h Source/CameraRigComponent.cpp - Source/CameraFramework_precompiled.h ) From 7000fe8c9c96a25dd50e80825095b3f21b6f7dc8 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:12:29 -0700 Subject: [PATCH 072/300] Gems/DebugDraw Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp | 2 -- Gems/DebugDraw/Code/Source/DebugDrawModule.cpp | 1 - Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp | 1 - Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp | 1 - Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp | 1 - Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp | 1 - Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp | 1 - Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h | 8 -------- .../Code/Source/EditorDebugDrawComponentCommon.cpp | 1 - .../Code/Source/EditorDebugDrawLineComponent.cpp | 1 - .../DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp | 1 - .../DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp | 1 - .../Code/Source/EditorDebugDrawSphereComponent.cpp | 1 - .../Code/Source/EditorDebugDrawTextComponent.cpp | 1 - Gems/DebugDraw/Code/debugdraw_editor_files.cmake | 1 - Gems/DebugDraw/Code/debugdraw_files.cmake | 1 - 16 files changed, 24 deletions(-) delete mode 100644 Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h diff --git a/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp index ce64e7ed91..e750ebfe30 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawLineComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" - #include #include diff --git a/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp b/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp index 13628a1ac4..960904b441 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawModule.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include "DebugDrawSystemComponent.h" #include "DebugDrawLineComponent.h" diff --git a/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp index 405a96dac4..29f2df22ab 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawObbComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp index 1e4b8d3975..cb88d7b37b 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawRayComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp index fe8fc8e44a..7bb1b8f3a9 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawSphereComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp index 7b7e229919..aaa3ff16a5 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp b/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp index 5cffc2e501..630517685d 100644 --- a/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp +++ b/Gems/DebugDraw/Code/Source/DebugDrawTextComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h b/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h deleted file mode 100644 index cc8a920d01..0000000000 --- a/Gems/DebugDraw/Code/Source/DebugDraw_precompiled.h +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp index deb95c4251..e644864369 100644 --- a/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp +++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawComponentCommon.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp index 4453358ba8..136df95fa7 100644 --- a/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp +++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawLineComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp index 6462b65c6f..a9615a99f2 100644 --- a/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp +++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawObbComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp index af3b125bb1..030d51ba23 100644 --- a/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp +++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawRayComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp index 6ddaac84ac..f7cdb03cb4 100644 --- a/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp +++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawSphereComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp index 20ce2ff09f..bbafa7a09d 100644 --- a/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp +++ b/Gems/DebugDraw/Code/Source/EditorDebugDrawTextComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "DebugDraw_precompiled.h" #include #include diff --git a/Gems/DebugDraw/Code/debugdraw_editor_files.cmake b/Gems/DebugDraw/Code/debugdraw_editor_files.cmake index b1e8cc372d..686639a81c 100644 --- a/Gems/DebugDraw/Code/debugdraw_editor_files.cmake +++ b/Gems/DebugDraw/Code/debugdraw_editor_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/DebugDraw_precompiled.h Include/DebugDraw/DebugDrawBus.h Source/DebugDrawModule.cpp Source/DebugDrawLineComponent.cpp diff --git a/Gems/DebugDraw/Code/debugdraw_files.cmake b/Gems/DebugDraw/Code/debugdraw_files.cmake index d45871ed3f..9e98d0d2f0 100644 --- a/Gems/DebugDraw/Code/debugdraw_files.cmake +++ b/Gems/DebugDraw/Code/debugdraw_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/DebugDraw_precompiled.h Include/DebugDraw/DebugDrawBus.h Source/DebugDrawLineComponent.cpp Source/DebugDrawLineComponent.h From 31a9f22d381583e9e3bfdcbecee3b610f6340000 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:15:38 -0700 Subject: [PATCH 073/300] Gems/Gestures Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Legacy/CryCommon/Mocks/StubTimer.h | 3 ++- Code/Legacy/CryCommon/TimeValue.h | 2 ++ Gems/Gestures/Code/Source/GesturesModule.cpp | 2 -- Gems/Gestures/Code/Source/GesturesSystemComponent.cpp | 2 -- Gems/Gestures/Code/Source/Gestures_precompiled.h | 11 ----------- Gems/Gestures/Code/Source/InputChannelGesture.cpp | 1 - .../Code/Source/InputChannelGestureClickOrTap.cpp | 2 -- Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp | 2 -- Gems/Gestures/Code/Source/InputChannelGestureHold.cpp | 2 -- .../Gestures/Code/Source/InputChannelGesturePinch.cpp | 2 -- .../Code/Source/InputChannelGestureRotate.cpp | 2 -- .../Gestures/Code/Source/InputChannelGestureSwipe.cpp | 2 -- Gems/Gestures/Code/Source/InputDeviceGestures.cpp | 2 -- .../Code/Tests/GestureRecognizerClickOrTapTests.cpp | 2 +- .../Code/Tests/GestureRecognizerPinchTests.cpp | 2 +- Gems/Gestures/Code/gestures_files.cmake | 1 - 16 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 Gems/Gestures/Code/Source/Gestures_precompiled.h diff --git a/Code/Legacy/CryCommon/Mocks/StubTimer.h b/Code/Legacy/CryCommon/Mocks/StubTimer.h index 5ed509caf9..126848a7ee 100644 --- a/Code/Legacy/CryCommon/Mocks/StubTimer.h +++ b/Code/Legacy/CryCommon/Mocks/StubTimer.h @@ -6,7 +6,8 @@ */ #pragma once -#include +#include +#include //! Simple stub timer that exposes a single simple interface for setting the current time. class StubTimer diff --git a/Code/Legacy/CryCommon/TimeValue.h b/Code/Legacy/CryCommon/TimeValue.h index af0950d7ea..ce2613fe9e 100644 --- a/Code/Legacy/CryCommon/TimeValue.h +++ b/Code/Legacy/CryCommon/TimeValue.h @@ -11,6 +11,8 @@ #pragma once +#include +#include class CTimeValue { diff --git a/Gems/Gestures/Code/Source/GesturesModule.cpp b/Gems/Gestures/Code/Source/GesturesModule.cpp index 404ed2f265..9343f14e4a 100644 --- a/Gems/Gestures/Code/Source/GesturesModule.cpp +++ b/Gems/Gestures/Code/Source/GesturesModule.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include #include "GesturesSystemComponent.h" diff --git a/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp b/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp index a5cafecb68..1abe171bab 100644 --- a/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp +++ b/Gems/Gestures/Code/Source/GesturesSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "GesturesSystemComponent.h" #include diff --git a/Gems/Gestures/Code/Source/Gestures_precompiled.h b/Gems/Gestures/Code/Source/Gestures_precompiled.h deleted file mode 100644 index 51811e518a..0000000000 --- a/Gems/Gestures/Code/Source/Gestures_precompiled.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include diff --git a/Gems/Gestures/Code/Source/InputChannelGesture.cpp b/Gems/Gestures/Code/Source/InputChannelGesture.cpp index 0a0e92ef1e..0053122c2f 100644 --- a/Gems/Gestures/Code/Source/InputChannelGesture.cpp +++ b/Gems/Gestures/Code/Source/InputChannelGesture.cpp @@ -5,7 +5,6 @@ * */ -#include "Gestures_precompiled.h" #include #include diff --git a/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp b/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp index 843ee5b529..8d8fcfcd4d 100644 --- a/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp +++ b/Gems/Gestures/Code/Source/InputChannelGestureClickOrTap.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "InputChannelGestureClickOrTap.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp b/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp index 6f3121b12d..4bac0d795b 100644 --- a/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp +++ b/Gems/Gestures/Code/Source/InputChannelGestureDrag.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "InputChannelGestureDrag.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp b/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp index ee8c382667..dad3deddf5 100644 --- a/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp +++ b/Gems/Gestures/Code/Source/InputChannelGestureHold.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "InputChannelGestureHold.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp b/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp index f8981e996f..cff831bd6f 100644 --- a/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp +++ b/Gems/Gestures/Code/Source/InputChannelGesturePinch.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "InputChannelGesturePinch.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp b/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp index baeca606fa..0217040aca 100644 --- a/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp +++ b/Gems/Gestures/Code/Source/InputChannelGestureRotate.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "InputChannelGestureRotate.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp b/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp index 360f2c071a..291843e0c3 100644 --- a/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp +++ b/Gems/Gestures/Code/Source/InputChannelGestureSwipe.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "InputChannelGestureSwipe.h" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/Gems/Gestures/Code/Source/InputDeviceGestures.cpp b/Gems/Gestures/Code/Source/InputDeviceGestures.cpp index 9ecd57a7b2..100cd58ae5 100644 --- a/Gems/Gestures/Code/Source/InputDeviceGestures.cpp +++ b/Gems/Gestures/Code/Source/InputDeviceGestures.cpp @@ -5,8 +5,6 @@ * */ -#include "Gestures_precompiled.h" - #include "InputDeviceGestures.h" #include diff --git a/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp b/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp index 58e33d4e85..750b68b610 100644 --- a/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp +++ b/Gems/Gestures/Code/Tests/GestureRecognizerClickOrTapTests.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Gestures_precompiled.h" + #include #include #include diff --git a/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp b/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp index 7fce2db313..f93f6443a5 100644 --- a/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp +++ b/Gems/Gestures/Code/Tests/GestureRecognizerPinchTests.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "Gestures_precompiled.h" + #include #include #include diff --git a/Gems/Gestures/Code/gestures_files.cmake b/Gems/Gestures/Code/gestures_files.cmake index 3faf88eea7..38f40a8e23 100644 --- a/Gems/Gestures/Code/gestures_files.cmake +++ b/Gems/Gestures/Code/gestures_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/Gestures_precompiled.h Include/Gestures/GestureRecognizerClickOrTap.h Include/Gestures/GestureRecognizerClickOrTap.inl Include/Gestures/GestureRecognizerDrag.h From 5eed3234adcc67203e650c4152eeb6efaaa87c33 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 14:50:30 -0700 Subject: [PATCH 074/300] Gems/HttpRequestor Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/HttpRequestor/Code/Source/ComponentStub.cpp | 1 - Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp | 2 +- Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp | 1 - .../Code/Source/HttpRequestorSystemComponent.cpp | 1 - .../Code/Source/HttpRequestor_precompiled.h | 10 ---------- Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp | 2 +- Gems/HttpRequestor/Code/httprequestor_files.cmake | 1 - .../HttpRequestor/Code/lmbraws_unsupported_files.cmake | 1 - 8 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h diff --git a/Gems/HttpRequestor/Code/Source/ComponentStub.cpp b/Gems/HttpRequestor/Code/Source/ComponentStub.cpp index f9c03ac233..dbdc1b3c25 100644 --- a/Gems/HttpRequestor/Code/Source/ComponentStub.cpp +++ b/Gems/HttpRequestor/Code/Source/ComponentStub.cpp @@ -5,7 +5,6 @@ * */ -#include "HttpRequestor_precompiled.h" #include AZ_DECLARE_MODULE_CLASS(Gem_HttpRequestor, AZ::Module) diff --git a/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp b/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp index eed88e3dae..981640e9d1 100644 --- a/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp +++ b/Gems/HttpRequestor/Code/Source/HttpRequestManager.cpp @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "HttpRequestor_precompiled.h" #include +#include // The AWS Native SDK AWSAllocator triggers a warning due to accessing members of std::allocator directly. // AWSAllocator.h(70): warning C4996: 'std::allocator::pointer': warning STL4010: Various members of std::allocator are deprecated in C++17. diff --git a/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp b/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp index c0321c6f3d..a1a6a4bb8b 100644 --- a/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp +++ b/Gems/HttpRequestor/Code/Source/HttpRequestorModule.cpp @@ -5,7 +5,6 @@ * */ -#include "HttpRequestor_precompiled.h" #include "HttpRequestorSystemComponent.h" #include diff --git a/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp b/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp index 6da1f28d9c..b6c617a616 100644 --- a/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp +++ b/Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "HttpRequestor_precompiled.h" #include #include diff --git a/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h b/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h deleted file mode 100644 index 2ff5546d1b..0000000000 --- a/Gems/HttpRequestor/Code/Source/HttpRequestor_precompiled.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include diff --git a/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp b/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp index 3a4a9e7d71..672a4e382c 100644 --- a/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp +++ b/Gems/HttpRequestor/Code/Tests/HttpRequestorTest.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "HttpRequestor_precompiled.h" + #include #include #include diff --git a/Gems/HttpRequestor/Code/httprequestor_files.cmake b/Gems/HttpRequestor/Code/httprequestor_files.cmake index 79bd51688d..1c714926d5 100644 --- a/Gems/HttpRequestor/Code/httprequestor_files.cmake +++ b/Gems/HttpRequestor/Code/httprequestor_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/HttpRequestor_precompiled.h Source/HttpRequestManager.cpp Source/HttpRequestManager.h Include/HttpRequestor/HttpRequestorBus.h diff --git a/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake b/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake index 52599c307c..6b02631077 100644 --- a/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake +++ b/Gems/HttpRequestor/Code/lmbraws_unsupported_files.cmake @@ -6,6 +6,5 @@ # set(FILES - Source/HttpRequestor_precompiled.h Source/ComponentStub.cpp ) From 7937ece77323c30def9d01bcb3748dc3d14e6795 Mon Sep 17 00:00:00 2001 From: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com> Date: Tue, 13 Jul 2021 15:07:16 -0700 Subject: [PATCH 075/300] [mobile-settings-crash-fix] update mobile settings editor tool to support new project path structure Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com> --- .../ProjectSettingsToolWindow.cpp | 36 +++++++++++-------- .../ProjectSettingsToolWindow.h | 4 +-- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp index f4e4fed973..8222c52193 100644 --- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp +++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.cpp @@ -20,8 +20,9 @@ #include "ValidationHandler.h" #include +#include -#include "AzToolsFramework/UI/PropertyEditor/InstanceDataHierarchy.h" +#include #include #include #include @@ -52,7 +53,7 @@ namespace ProjectSettingsTool PlatformEnabled(PlatformId::Ios) ? ProjectSettingsContainer::PlistInitVector({ ProjectSettingsContainer::PlatformAndPath - { PlatformId::Ios, m_projectRoot + PlatformResourcesFolder(PlatformId::Ios) } + { PlatformId::Ios, GetPlatformResource(PlatformId::Ios) } }) : ProjectSettingsContainer::PlistInitVector()) @@ -647,33 +648,38 @@ namespace ProjectSettingsTool // iOS can be disabled if the plist file is missing if (platformId == PlatformId::Ios) { - const AZStd::string filename = m_projectRoot + PlatformResourcesFolder(platformId); - return CFileUtil::FileExists(filename.c_str()); + AZStd::string plistPath = GetPlatformResource(platformId); + return !plistPath.empty(); } return true; } - const char* ProjectSettingsToolWindow::PlatformResourcesFolder(PlatformId platformId) + AZStd::string ProjectSettingsToolWindow::GetPlatformResource(PlatformId platformId) { if (platformId == PlatformId::Ios) { - const AZStd::string firstfilename = m_projectRoot + "/Gem/Resources/Platform/iOS/Info.plist"; - if (CFileUtil::FileExists(firstfilename.c_str())) - { - return "/Gem/Resources/Platform/iOS/Info.plist"; - } - else + const char* searchPaths[] = { + "Resources/Platform/iOS/Info.plist", + + // legacy paths + "Gem/Resources/Platform/iOS/Info.plist", + "Gem/Resources/IOSLauncher/Info.plist", + }; + + for (auto relPath : searchPaths) { - const AZStd::string filename = m_projectRoot + "/Gem/Resources/IOSLauncher/Info.plist"; - if (CFileUtil::FileExists(filename.c_str())) + AZ::IO::FixedMaxPath projectPlist{ m_projectRoot }; + projectPlist /= relPath; + + if (CFileUtil::FileExists(projectPlist.c_str())) { - return "/Gem/Resources/IOSLauncher/Info.plist"; + return projectPlist.LexicallyNormal().c_str(); } } } - return nullptr; + return AZStd::string(); } #include diff --git a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h index 8979672f99..64a6646e7f 100644 --- a/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h +++ b/Code/Editor/Plugins/ProjectSettingsTool/ProjectSettingsToolWindow.h @@ -137,8 +137,8 @@ namespace ProjectSettingsTool // returns true if the platform is enabled bool PlatformEnabled(PlatformId platformId); - // returns the resource folder - const char* PlatformResourcesFolder(PlatformId platformId); + // returns the main platform specific resource file e.g. for iOS it would be the Info.plist + AZStd::string GetPlatformResource(PlatformId platformId); // The ui for the window QScopedPointer m_ui; From 316eb65c2c9c31339d848b6336f2b3f314a32cc5 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 15:20:42 -0700 Subject: [PATCH 076/300] Gems/EMotionFX Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/EMotionFX_precompiled.h | 18 ------------------ .../Integration/Assets/AnimGraphAsset.cpp | 6 ++++-- .../Source/Integration/Assets/MotionAsset.cpp | 6 +++--- .../Integration/Assets/MotionSetAsset.cpp | 11 ++++++----- .../Integration/Components/ActorComponent.cpp | 8 ++++++-- .../Components/AnimAudioComponent.cpp | 2 -- .../Components/AnimAudioComponent.h | 1 + .../Components/AnimGraphComponent.cpp | 7 ++++--- .../Components/SimpleLODComponent.cpp | 3 +-- .../Components/SimpleMotionComponent.cpp | 6 +++--- .../Editor/Components/EditorActorComponent.cpp | 4 ++-- .../Components/EditorAnimAudioComponent.cpp | 2 -- .../Components/EditorAnimGraphComponent.cpp | 4 +--- .../Components/EditorSimpleLODComponent.cpp | 1 - .../Components/EditorSimpleMotionComponent.cpp | 5 ++--- .../Integration/System/AnimationModule.cpp | 3 --- .../Integration/System/SystemComponent.cpp | 10 +++++++--- .../Code/Tests/EMotionFXBuilderFixture.cpp | 6 +++++- .../Code/Tests/EmotionFXMathLibTests.cpp | 2 -- .../Code/Tests/KeyTrackLinearTests.cpp | 2 -- .../Code/emotionfx_editor_files.cmake | 1 - Gems/EMotionFX/Code/emotionfx_files.cmake | 1 - 22 files changed, 45 insertions(+), 64 deletions(-) delete mode 100644 Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h diff --git a/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h b/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h deleted file mode 100644 index 6416d94c41..0000000000 --- a/Gems/EMotionFX/Code/Source/EMotionFX_precompiled.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - - -#pragma once - -// Minimal integration system bits, such as allocator definition, smart pointers, etc. -#include // Many CryCommon files require that this is included first. -#include -// When we go full-source for EMotion FX, we'll want to ensure we're no longer pulling it all in via PCH, -// and instead apply our normal philosophy around minimal includes. -// Though if EMotion FX has any internal defines that drive behavior, we'd still potentially want an include wrapper. -#include -#include diff --git a/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp index 8955d714d5..3f20e34c6d 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Assets/AnimGraphAsset.cpp @@ -5,11 +5,13 @@ * */ -#include "EMotionFX_precompiled.h" #include #include #include - +#include +#include +#include +#include namespace EMotionFX { diff --git a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp index e4013aed7c..feda355a7a 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionAsset.cpp @@ -5,10 +5,10 @@ * */ - -#include "EMotionFX_precompiled.h" - #include +#include +#include +#include namespace EMotionFX { diff --git a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp index e988fd9b46..467c2f6f58 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Assets/MotionSetAsset.cpp @@ -5,13 +5,14 @@ * */ - -#include "EMotionFX_precompiled.h" - #include #include +#include #include +#include +#include +#include namespace EMotionFX { @@ -152,9 +153,9 @@ namespace EMotionFX { AZStd::string assetSourcePath = devAssetsPath; - AzFramework::StringFunc::AssetDatabasePath::Normalize(assetSourcePath); + AZ::StringFunc::AssetDatabasePath::Normalize(assetSourcePath); AZStd::string filename; - AzFramework::StringFunc::AssetDatabasePath::Join(assetSourcePath.c_str(), assetFilename.c_str(), filename); + AZ::StringFunc::AssetDatabasePath::Join(assetSourcePath.c_str(), assetFilename.c_str(), filename); assetData->m_emfxMotionSet->SetFilename(filename.c_str()); } diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp index fbb8541b2b..71f40e709c 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Components/ActorComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "EMotionFX_precompiled.h" - #include #include #include @@ -26,6 +24,12 @@ #include #include #include +#include +#include +#include +#include + +#include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp index d9cfe881d8..57b5e238f9 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.cpp @@ -7,8 +7,6 @@ #include -#include "EMotionFX_precompiled.h" - #include #include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h index 0c14a6f585..1c65867d28 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h +++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimAudioComponent.h @@ -13,6 +13,7 @@ #include #include #include +#include namespace EMotionFX { diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp index 81c445f99f..d4857eec7a 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Components/AnimGraphComponent.cpp @@ -5,16 +5,17 @@ * */ - -#include "EMotionFX_precompiled.h" - #include #include #include #include #include +#include #include +#include +#include +#include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp index 5ea88f2c7b..12151fe003 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleLODComponent.cpp @@ -8,8 +8,6 @@ #include -#include "EMotionFX_precompiled.h" - #include #include #include @@ -17,6 +15,7 @@ #include #include +#include #include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp index 6287d2ddb8..f533f5701f 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Components/SimpleMotionComponent.cpp @@ -5,9 +5,6 @@ * */ - -#include "EMotionFX_precompiled.h" - #include #include #include @@ -16,6 +13,9 @@ #include #include +#include +#include +#include namespace EMotionFX { diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp index 3a6c1a7991..641523b6ee 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorActorComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "EMotionFX_precompiled.h" - #include #include #include @@ -29,6 +27,8 @@ #include #include #include +#include +#include #include namespace EMotionFX diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp index e0c79aeb77..e2ed1d0370 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimAudioComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "EMotionFX_precompiled.h" - #include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp index 4e8f743fe9..6885593af2 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorAnimGraphComponent.cpp @@ -5,9 +5,6 @@ * */ - -#include "EMotionFX_precompiled.h" - #include #include #include @@ -21,6 +18,7 @@ #include #include #include +#include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp index 65deb8f928..6691b6b5f4 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleLODComponent.cpp @@ -7,7 +7,6 @@ #include -#include "EMotionFX_precompiled.h" #include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp index 3398b954e4..3c7402be86 100644 --- a/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/Editor/Components/EditorSimpleMotionComponent.cpp @@ -5,9 +5,6 @@ * */ - -#include "EMotionFX_precompiled.h" - #include #include #include @@ -19,6 +16,8 @@ #include #include #include +#include +#include namespace EMotionFX { diff --git a/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp b/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp index e2f74fe0cd..7b441b6857 100644 --- a/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/System/AnimationModule.cpp @@ -5,9 +5,6 @@ * */ - -#include "EMotionFX_precompiled.h" - #include #include #include diff --git a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp index b0384c7577..00406c1e04 100644 --- a/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp +++ b/Gems/EMotionFX/Code/Source/Integration/System/SystemComponent.cpp @@ -5,9 +5,6 @@ * */ - -#include "EMotionFX_precompiled.h" - #include #include #include @@ -29,6 +26,13 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp index b4cfa1e5f4..b3163ce5aa 100644 --- a/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp +++ b/Gems/EMotionFX/Code/Tests/EMotionFXBuilderFixture.cpp @@ -5,13 +5,17 @@ * */ -#include "EMotionFX_precompiled.h" #include "EMotionFXBuilderFixture.h" #include #include #include #include +#include +#include +#include +#include +#include #include #include diff --git a/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp b/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp index c0e8ae1be5..ebb3c6d233 100644 --- a/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp +++ b/Gems/EMotionFX/Code/Tests/EmotionFXMathLibTests.cpp @@ -5,8 +5,6 @@ * */ -#include "EMotionFX_precompiled.h" - #include #include #include diff --git a/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp b/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp index e2481f4b19..849da44470 100644 --- a/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp +++ b/Gems/EMotionFX/Code/Tests/KeyTrackLinearTests.cpp @@ -5,8 +5,6 @@ * */ - -#include "EMotionFX_precompiled.h" #include "SystemComponentFixture.h" #include diff --git a/Gems/EMotionFX/Code/emotionfx_editor_files.cmake b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake index 112309b710..08893e5e17 100644 --- a/Gems/EMotionFX/Code/emotionfx_editor_files.cmake +++ b/Gems/EMotionFX/Code/emotionfx_editor_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/EMotionFX_precompiled.h ../Assets/Editor/Layouts/Layouts.qrc ../Assets/Editor/Images/Icons/Resources.qrc ../Assets/Editor/Images/Icons/ActorComponent.svg diff --git a/Gems/EMotionFX/Code/emotionfx_files.cmake b/Gems/EMotionFX/Code/emotionfx_files.cmake index 6eb336b81d..ee64510a34 100644 --- a/Gems/EMotionFX/Code/emotionfx_files.cmake +++ b/Gems/EMotionFX/Code/emotionfx_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/EMotionFX_precompiled.h Include/Integration/AnimationBus.h Include/Integration/MotionExtractionBus.h Source/Integration/System/SystemComponent.cpp From 8dada0795918e723703dff1cb215f2fbb3682bbc Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 15:24:52 -0700 Subject: [PATCH 077/300] Gems/ImGui Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp | 2 -- Gems/ImGui/Code/Source/ImGuiGem.cpp | 1 - Gems/ImGui/Code/Source/ImGuiManager.cpp | 1 - Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp | 2 -- Gems/ImGui/Code/Source/ImGui_precompiled.h | 12 ------------ .../Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp | 1 - .../Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp | 2 -- .../Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp | 1 - .../Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp | 1 - .../Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp | 1 - .../Code/Source/LYImGuiUtils/HistogramContainer.cpp | 2 +- .../Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp | 1 - Gems/ImGui/Code/imgui_common_files.cmake | 1 - Gems/ImGui/Code/imgui_lyutils_static_files.cmake | 1 - 14 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 Gems/ImGui/Code/Source/ImGui_precompiled.h diff --git a/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp b/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp index d96c9b719d..013c642d7c 100644 --- a/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp +++ b/Gems/ImGui/Code/Editor/ImGuiEditorWindowModule.cpp @@ -5,8 +5,6 @@ * */ -#include "ImGui_precompiled.h" - #include "ImGuiGem.h" namespace ImGui diff --git a/Gems/ImGui/Code/Source/ImGuiGem.cpp b/Gems/ImGui/Code/Source/ImGuiGem.cpp index 6f0107cb1f..e12ba09ca8 100644 --- a/Gems/ImGui/Code/Source/ImGuiGem.cpp +++ b/Gems/ImGui/Code/Source/ImGuiGem.cpp @@ -5,7 +5,6 @@ * */ -#include "ImGui_precompiled.h" #include "ImGuiGem.h" namespace ImGui diff --git a/Gems/ImGui/Code/Source/ImGuiManager.cpp b/Gems/ImGui/Code/Source/ImGuiManager.cpp index 7b2506fbcb..ce80194069 100644 --- a/Gems/ImGui/Code/Source/ImGuiManager.cpp +++ b/Gems/ImGui/Code/Source/ImGuiManager.cpp @@ -5,7 +5,6 @@ * */ -#include "ImGui_precompiled.h" #include "ImGuiManager.h" #include #include diff --git a/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp b/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp index 43a8800c83..00ea588e91 100644 --- a/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp +++ b/Gems/ImGui/Code/Source/ImGuiNoOpStubModule.cpp @@ -5,8 +5,6 @@ * */ -#include "ImGui_precompiled.h" - namespace ImGui { /*! diff --git a/Gems/ImGui/Code/Source/ImGui_precompiled.h b/Gems/ImGui/Code/Source/ImGui_precompiled.h deleted file mode 100644 index d47df93cfc..0000000000 --- a/Gems/ImGui/Code/Source/ImGui_precompiled.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ -#pragma once - -#include -#include -#include -#include diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp index d9d81c24f2..bb40818340 100644 --- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp +++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYAssetExplorer.cpp @@ -5,7 +5,6 @@ * */ -#include "ImGui_precompiled.h" #include "ImGuiLYAssetExplorer.h" #ifdef IMGUI_ENABLED diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp index c83d9520a4..8c430cc023 100644 --- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp +++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCameraMonitor.cpp @@ -5,8 +5,6 @@ * */ -#include "ImGui_precompiled.h" - #ifdef IMGUI_ENABLED #include "ImGuiLYCameraMonitor.h" #include diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp index eb918041f7..7f70adfc2e 100644 --- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp +++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCommonMenu.cpp @@ -5,7 +5,6 @@ * */ -#include "ImGui_precompiled.h" #include "ImGuiLYCommonMenu.h" #ifdef IMGUI_ENABLED diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp index a9d2052f1a..613d44d47a 100644 --- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp +++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYCurveEditor.cpp @@ -5,7 +5,6 @@ * */ -#include "ImGui_precompiled.h" #include "ImGuiLYCurveEditor.h" #ifdef IMGUI_ENABLED diff --git a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp index 57502296ae..452d795f1f 100644 --- a/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp +++ b/Gems/ImGui/Code/Source/LYCommonMenu/ImGuiLYEntityOutliner.cpp @@ -5,7 +5,6 @@ * */ -#include "ImGui_precompiled.h" #include "ImGuiLYEntityOutliner.h" #ifdef IMGUI_ENABLED diff --git a/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp b/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp index 9295492f50..9403b2ae8a 100644 --- a/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp +++ b/Gems/ImGui/Code/Source/LYImGuiUtils/HistogramContainer.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "ImGui_precompiled.h" + #include "LYImGuiUtils/HistogramContainer.h" #ifdef IMGUI_ENABLED diff --git a/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp b/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp index 3ab1de7ca7..317e3b9c19 100644 --- a/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp +++ b/Gems/ImGui/Code/Source/LYImGuiUtils/ImGuiDrawHelpers.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "ImGui_precompiled.h" #ifdef IMGUI_ENABLED #include "LYImGuiUtils/ImGuiDrawHelpers.h" diff --git a/Gems/ImGui/Code/imgui_common_files.cmake b/Gems/ImGui/Code/imgui_common_files.cmake index 23f1374b98..6ef0fbefb2 100644 --- a/Gems/ImGui/Code/imgui_common_files.cmake +++ b/Gems/ImGui/Code/imgui_common_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/ImGui_precompiled.h Include/ImGuiBus.h Include/ImGuiContextScope.h Include/OtherActiveImGuiBus.h diff --git a/Gems/ImGui/Code/imgui_lyutils_static_files.cmake b/Gems/ImGui/Code/imgui_lyutils_static_files.cmake index 6915882f4c..0102e80e87 100644 --- a/Gems/ImGui/Code/imgui_lyutils_static_files.cmake +++ b/Gems/ImGui/Code/imgui_lyutils_static_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/ImGui_precompiled.h Include/LYImGuiUtils/HistogramContainer.h Include/LYImGuiUtils/ImGuiDrawHelpers.h Source/LYImGuiUtils/HistogramContainer.cpp From 525a0bdc317fd209e66039d8e7c7713f279fdab9 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 15:27:45 -0700 Subject: [PATCH 078/300] Gems/InAppPurchases Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Code/Source/InAppPurchasesInterface.cpp | 2 -- .../Code/Source/InAppPurchasesModule.cpp | 2 -- .../Code/Source/InAppPurchasesSystemComponent.cpp | 2 -- .../Code/Source/InAppPurchases_precompiled.h | 13 ------------- .../Unimplemented/InAppPurchases_Unimplemented.cpp | 2 -- Gems/InAppPurchases/Code/inapppurchases_files.cmake | 1 - 6 files changed, 22 deletions(-) delete mode 100644 Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h diff --git a/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp b/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp index 72220fc9e3..ec18ddcf3d 100644 --- a/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp +++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesInterface.cpp @@ -5,8 +5,6 @@ * */ -#include "InAppPurchases_precompiled.h" - #include namespace InAppPurchases diff --git a/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp b/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp index 0feb9a38cf..05e8f17b4c 100644 --- a/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp +++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesModule.cpp @@ -5,8 +5,6 @@ * */ -#include "InAppPurchases_precompiled.h" - #include "InAppPurchasesModule.h" #include "InAppPurchasesSystemComponent.h" diff --git a/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp b/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp index e2704d7529..22d2a465ff 100644 --- a/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp +++ b/Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp @@ -5,8 +5,6 @@ * */ -#include "InAppPurchases_precompiled.h" - #include #include #include diff --git a/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h b/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h deleted file mode 100644 index f620f712e2..0000000000 --- a/Gems/InAppPurchases/Code/Source/InAppPurchases_precompiled.h +++ /dev/null @@ -1,13 +0,0 @@ -/* - * Copyright (c) Contributors to the Open 3D Engine Project. For complete copyright and license terms please see the LICENSE at the root of this distribution. - * - * SPDX-License-Identifier: Apache-2.0 OR MIT - * - */ - -#pragma once - -#include -#include -#include -#include diff --git a/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp b/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp index b9665c08a8..e8eaa29e48 100644 --- a/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp +++ b/Gems/InAppPurchases/Code/Source/Platform/Common/Unimplemented/InAppPurchases_Unimplemented.cpp @@ -5,8 +5,6 @@ * */ -#include "InAppPurchases_precompiled.h" - #include namespace InAppPurchases diff --git a/Gems/InAppPurchases/Code/inapppurchases_files.cmake b/Gems/InAppPurchases/Code/inapppurchases_files.cmake index 4242317634..a7948ad7d2 100644 --- a/Gems/InAppPurchases/Code/inapppurchases_files.cmake +++ b/Gems/InAppPurchases/Code/inapppurchases_files.cmake @@ -6,7 +6,6 @@ # set(FILES - Source/InAppPurchases_precompiled.h Include/InAppPurchases/InAppPurchasesBus.h Include/InAppPurchases/InAppPurchasesInterface.h Include/InAppPurchases/InAppPurchasesResponseBus.h From 21dfcecb08d2bd01f32e8d377613f7df6e2b9f78 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Tue, 13 Jul 2021 15:38:50 -0700 Subject: [PATCH 079/300] Gems/LmbrCentral Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- .../Ai/EditorNavigationAreaComponent.cpp | 1 - .../Ai/EditorNavigationSeedComponent.cpp | 1 - .../Code/Source/Ai/EditorNavigationUtil.cpp | 1 - .../Code/Source/Ai/NavigationComponent.cpp | 1 - .../Source/Ai/NavigationSystemComponent.cpp | 1 - .../Audio/AudioAreaEnvironmentComponent.cpp | 1 - .../Audio/AudioEnvironmentComponent.cpp | 1 - .../Source/Audio/AudioListenerComponent.cpp | 1 - .../Audio/AudioMultiPositionComponent.cpp | 1 - .../Source/Audio/AudioPreloadComponent.cpp | 1 - .../Code/Source/Audio/AudioProxyComponent.cpp | 1 - .../Code/Source/Audio/AudioRtpcComponent.cpp | 1 - .../Source/Audio/AudioSwitchComponent.cpp | 1 - .../Source/Audio/AudioSystemComponent.cpp | 1 - .../Source/Audio/AudioTriggerComponent.cpp | 1 - .../EditorAudioAreaEnvironmentComponent.cpp | 1 - .../Audio/EditorAudioEnvironmentComponent.cpp | 1 - .../Audio/EditorAudioListenerComponent.cpp | 1 - .../EditorAudioMultiPositionComponent.cpp | 1 - .../Audio/EditorAudioPreloadComponent.cpp | 1 - .../Source/Audio/EditorAudioRtpcComponent.cpp | 1 - .../Audio/EditorAudioSwitchComponent.cpp | 1 - .../Audio/EditorAudioTriggerComponent.cpp | 1 - .../BenchmarkAssetBuilderComponent.cpp | 1 - .../BenchmarkAssetBuilderWorker.cpp | 4 +- .../CfgBuilderWorker/CfgBuilderWorker.cpp | 1 - .../CopyDependencyBuilderComponent.cpp | 1 - .../CopyDependencyBuilderWorker.cpp | 1 - .../EmfxWorkspaceBuilderWorker.cpp | 1 - .../FontBuilderWorker/FontBuilderWorker.cpp | 1 - .../SchemaBuilderWorker.cpp | 1 - .../SchemaBuilderWorker/SchemaUtils.cpp | 1 - .../XmlBuilderWorker/XmlBuilderWorker.cpp | 1 - .../XmlFormattedAssetBuilderWorker.cpp | 1 - .../DependencyBuilderComponent.cpp | 1 - .../DependencyBuilderWorker.cpp | 1 - .../SeedBuilderWorker/SeedBuilderWorker.cpp | 1 - .../LevelBuilder/LevelBuilderComponent.cpp | 1 - .../LevelBuilder/LevelBuilderWorker.cpp | 1 - .../LuaBuilder/LuaBuilderComponent.cpp | 1 - .../Builders/LuaBuilder/LuaBuilderWorker.cpp | 1 - .../Source/Builders/LuaBuilder/LuaHelpers.cpp | 1 - .../MaterialBuilderComponent.cpp | 1 - .../SliceBuilder/SliceBuilderComponent.cpp | 1 - .../SliceBuilder/SliceBuilderWorker.cpp | 1 - .../TranslationBuilderComponent.cpp | 1 - .../Bundling/BundlingSystemComponent.cpp | 1 - .../Source/Editor/EditorCommentComponent.cpp | 1 - .../Source/Events/ReflectScriptableEvents.cpp | 1 - .../Geometry/GeometrySystemComponent.cpp | 2 - Gems/LmbrCentral/Code/Source/LmbrCentral.cpp | 1 - .../Code/Source/LmbrCentralEditor.cpp | 1 - .../Code/Source/LmbrCentral_precompiled.h | 39 ------------------- .../Rendering/EntityDebugDisplayComponent.cpp | 1 - .../Scripting/EditorLookAtComponent.cpp | 1 - .../EditorRandomTimedSpawnerComponent.cpp | 1 - .../Scripting/EditorSpawnerComponent.cpp | 1 - .../Source/Scripting/EditorTagComponent.cpp | 1 - .../Code/Source/Scripting/LookAtComponent.cpp | 1 - .../Scripting/RandomTimedSpawnerComponent.cpp | 1 - .../Source/Scripting/SimpleStateComponent.cpp | 1 - .../Source/Scripting/SpawnerComponent.cpp | 1 - .../Code/Source/Scripting/TagComponent.cpp | 1 - .../Code/Source/Shape/BoxShape.cpp | 1 - .../Code/Source/Shape/BoxShapeComponent.cpp | 1 - .../Code/Source/Shape/CapsuleShape.cpp | 1 - .../Source/Shape/CapsuleShapeComponent.cpp | 1 - .../Source/Shape/CompoundShapeComponent.cpp | 1 - .../Code/Source/Shape/CylinderShape.cpp | 1 - .../Source/Shape/CylinderShapeComponent.cpp | 1 - .../Code/Source/Shape/DiskShape.cpp | 1 - .../Code/Source/Shape/DiskShapeComponent.cpp | 1 - .../Source/Shape/EditorBaseShapeComponent.cpp | 1 - .../Source/Shape/EditorBoxShapeComponent.cpp | 1 - .../Shape/EditorCapsuleShapeComponent.cpp | 1 - .../Shape/EditorCompoundShapeComponent.cpp | 1 - .../Shape/EditorCylinderShapeComponent.cpp | 1 - .../Source/Shape/EditorDiskShapeComponent.cpp | 1 - .../EditorPolygonPrismShapeComponent.cpp | 1 - .../EditorPolygonPrismShapeComponentMode.cpp | 1 - .../Source/Shape/EditorQuadShapeComponent.cpp | 1 - .../Shape/EditorShapeComponentConverters.cpp | 1 - .../Shape/EditorSphereShapeComponent.cpp | 1 - .../Source/Shape/EditorSplineComponent.cpp | 1 - .../Shape/EditorSplineComponentMode.cpp | 1 - .../Source/Shape/EditorTubeShapeComponent.cpp | 1 - .../Shape/EditorTubeShapeComponentMode.cpp | 1 - .../Code/Source/Shape/PolygonPrismShape.cpp | 1 - .../Shape/PolygonPrismShapeComponent.cpp | 1 - .../Code/Source/Shape/QuadShape.cpp | 1 - .../Code/Source/Shape/QuadShapeComponent.cpp | 1 - .../Code/Source/Shape/ShapeComponent.cpp | 1 - .../Source/Shape/ShapeComponentConverters.cpp | 1 - .../Code/Source/Shape/ShapeGeometryUtil.cpp | 1 - .../Code/Source/Shape/ShapeGeometryUtil.h | 1 + .../Code/Source/Shape/SphereShape.cpp | 1 - .../Source/Shape/SphereShapeComponent.cpp | 1 - .../Code/Source/Shape/SplineComponent.cpp | 1 - .../Code/Source/Shape/TubeShape.cpp | 1 - .../Code/Source/Shape/TubeShapeComponent.cpp | 1 - .../Hidden/TextureMipmapAssetTypeInfo.cpp | 1 - .../Material/MaterialAssetTypeInfo.cpp | 1 - .../Unhandled/Other/AudioAssetTypeInfo.cpp | 1 - .../Other/CharacterPhysicsAssetTypeInfo.cpp | 1 - .../EntityPrototypeLibraryAssetTypeInfo.cpp | 1 - .../Other/GameTokenAssetTypeInfo.cpp | 1 - .../Unhandled/Other/GroupAssetTypeInfo.cpp | 1 - .../Other/PrefabsLibraryAssetTypeInfo.cpp | 1 - .../Texture/SubstanceAssetTypeInfo.cpp | 1 - .../Texture/TextureAssetTypeInfo.cpp | 1 - .../Unhandled/UI/EntityIconAssetTypeInfo.cpp | 1 - .../Source/Unhandled/UI/FontAssetTypeInfo.cpp | 1 - .../Unhandled/UI/UICanvasAssetTypeInfo.cpp | 1 - .../Code/Tests/AudioComponentTests.cpp | 1 - Gems/LmbrCentral/Code/Tests/BoxShapeTest.cpp | 1 - .../Builders/CopyDependencyBuilderTest.cpp | 1 - .../Code/Tests/Builders/LevelBuilderTest.cpp | 1 - .../Code/Tests/Builders/LuaBuilderTests.cpp | 1 - .../Tests/Builders/MaterialBuilderTests.cpp | 1 - .../Code/Tests/Builders/SeedBuilderTests.cpp | 2 +- .../Code/Tests/Builders/SliceBuilderTests.cpp | 1 - .../Tests/BundlingSystemComponentTests.cpp | 1 - .../Code/Tests/CapsuleShapeTest.cpp | 1 - .../Code/Tests/CylinderShapeTest.cpp | 1 - Gems/LmbrCentral/Code/Tests/DiskShapeTest.cpp | 1 - .../Tests/EditorBoxShapeComponentTests.cpp | 1 - .../EditorCapsuleShapeComponentTests.cpp | 1 - .../EditorCompoundShapeComponentTests.cpp | 1 - .../EditorCylinderShapeComponentTests.cpp | 1 - .../EditorPolygonPrismShapeComponentTests.cpp | 1 - .../Tests/EditorSphereShapeComponentTests.cpp | 1 - .../Code/Tests/LmbrCentralReflectionTest.cpp | 1 - .../Code/Tests/PolygonPrismShapeTest.cpp | 1 - Gems/LmbrCentral/Code/Tests/QuadShapeTest.cpp | 1 - .../Code/Tests/ShapeGeometryUtilTest.cpp | 1 - .../Code/Tests/SpawnerComponentTest.cpp | 1 - .../Code/Tests/SphereShapeTest.cpp | 1 - .../Code/Tests/SplineComponentTests.cpp | 1 - Gems/LmbrCentral/Code/Tests/TubeShapeTest.cpp | 1 - Gems/LmbrCentral/Code/lmbrcentral_files.cmake | 1 - 140 files changed, 5 insertions(+), 178 deletions(-) delete mode 100644 Gems/LmbrCentral/Code/Source/LmbrCentral_precompiled.h diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp index 1e0d759082..f6b814154b 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationAreaComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "EditorNavigationAreaComponent.h" #include "EditorNavigationUtil.h" diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp index 56d1f0b622..9786fd662b 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationSeedComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "EditorNavigationSeedComponent.h" #include "EditorNavigationUtil.h" diff --git a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp index d5c83e668b..6f3d6c4e2d 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/EditorNavigationUtil.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "EditorNavigationUtil.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp index 26ddf17879..d0cced241c 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "LmbrCentral_precompiled.h" #include "NavigationComponent.h" #include "EditorNavigationUtil.h" diff --git a/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp b/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp index 4491ce7498..31217b060b 100644 --- a/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Ai/NavigationSystemComponent.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 OR MIT * */ -#include "LmbrCentral_precompiled.h" #include "NavigationSystemComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp index daa76292dc..35addf2a1e 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioAreaEnvironmentComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioAreaEnvironmentComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp index 3623eda163..bf5fd3593d 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioEnvironmentComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioEnvironmentComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp index f5c7dcce62..cb0b96e80b 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioListenerComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioListenerComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp index 1fb7276100..8405938c67 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioMultiPositionComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioMultiPositionComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp index 550233799c..3bad75e7bd 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioPreloadComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioPreloadComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp index 554be27fae..3a2c1e77cc 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioProxyComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioProxyComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp index b474b9811c..45808feeb3 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioRtpcComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioRtpcComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp index 2ea9f31927..be82f000e3 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioSwitchComponent.cpp @@ -5,7 +5,6 @@ * */ -#include "LmbrCentral_precompiled.h" #include "AudioSwitchComponent.h" #include diff --git a/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp b/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp index 9765e9dd0b..da1e00f50a 100644 --- a/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp +++ b/Gems/LmbrCentral/Code/Source/Audio/AudioSystemComponent.cpp @@ -5,7 +5,6 @@ * */ -#include #include