From c98d14ad924d2e0efe9eeff650b899cdeb204cda Mon Sep 17 00:00:00 2001 From: Guthrie Adams Date: Thu, 20 Jan 2022 00:10:07 -0600 Subject: [PATCH] =?UTF-8?q?Atom=20Tools:=20Removing=20unnecessary=20module?= =?UTF-8?q?s,=20components,=20and=20dead=20code=20from=20ME=20=E2=80=A2=20?= =?UTF-8?q?Working=20toward=20creating=20a=20standalone=20application=20te?= =?UTF-8?q?mplate=20Removing=20application=20level=20modules=20and=20syste?= =?UTF-8?q?m=20components=20that=20make=20it=20difficult=20to=20navigate?= =?UTF-8?q?=20the=20project=20and=20add=20a=20lot=20of=20boilerplate=20cod?= =?UTF-8?q?e=20=E2=80=A2=20Temporarily=20keeping=20viewport=20module=20and?= =?UTF-8?q?=20components=20because=20shutting=20down=20the=20application?= =?UTF-8?q?=20deactivates=20module=20entities=20before=20system=20entities?= =?UTF-8?q?=20without=20respecting=20component=20service=20dependency=20or?= =?UTF-8?q?der.=20This=20caused=20several=20RPI=20assets=20and=20names=20t?= =?UTF-8?q?o=20leak=20because=20they=20were=20not=20being=20destroyed=20in?= =?UTF-8?q?=20the=20correct=20order.=20=E2=80=A2=20Fixing=20include=20path?= =?UTF-8?q?s=20not=20referenced=20source=20folders=20=E2=80=A2=20Mostly=20?= =?UTF-8?q?cleanup=20and=20reorganization,=20no=20behavioral=20changes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guthrie Adams --- .../Application/AtomToolsApplication.cpp | 4 + .../AtomToolsFrameworkSystemComponent.cpp | 6 +- .../DynamicProperty/DynamicProperty.cpp | 2 +- .../Code/Source/Inspector/InspectorWidget.cpp | 2 +- .../Tools/MaterialEditor/Code/CMakeLists.txt | 80 ++----------- .../Atom/Document/MaterialDocumentModule.h | 29 ----- .../Atom/Window/MaterialEditorWindowModule.h | 28 ----- .../Code/Source/Document/MaterialDocument.h | 7 +- .../Document/MaterialDocumentModule.cpp | 30 ----- .../Document/MaterialDocumentRequestBus.h | 0 .../Document/MaterialDocumentSettings.cpp | 2 +- .../Document/MaterialDocumentSettings.h | 0 .../MaterialDocumentSystemComponent.cpp | 85 -------------- .../MaterialDocumentSystemComponent.h | 41 ------- .../Code/Source/MaterialEditorApplication.cpp | 107 ++++++++++++++---- .../Code/Source/MaterialEditorApplication.h | 19 ++++ .../Viewport/InputController/Behavior.cpp | 5 +- .../InputController/DollyCameraBehavior.cpp | 4 +- .../InputController/DollyCameraBehavior.h | 2 +- .../Viewport/InputController/IdleBehavior.cpp | 2 +- .../Viewport/InputController/IdleBehavior.h | 2 +- .../MaterialEditorViewportInputController.cpp | 24 ++-- .../MaterialEditorViewportInputController.h | 4 +- ...MaterialEditorViewportInputControllerBus.h | 0 .../InputController/MoveCameraBehavior.cpp | 6 +- .../InputController/MoveCameraBehavior.h | 2 +- .../InputController/OrbitCameraBehavior.cpp | 2 +- .../InputController/OrbitCameraBehavior.h | 2 +- .../InputController/PanCameraBehavior.cpp | 8 +- .../InputController/PanCameraBehavior.h | 2 +- .../RotateEnvironmentBehavior.cpp | 2 +- .../RotateEnvironmentBehavior.h | 2 +- .../InputController/RotateModelBehavior.cpp | 2 +- .../InputController/RotateModelBehavior.h | 2 +- .../Viewport/MaterialViewportComponent.cpp | 17 +-- .../Viewport/MaterialViewportComponent.h | 4 +- .../Viewport/MaterialViewportModule.cpp | 2 +- .../Viewport/MaterialViewportModule.h | 0 .../MaterialViewportNotificationBus.h | 0 .../Viewport/MaterialViewportRenderer.cpp | 36 +++--- .../Viewport/MaterialViewportRenderer.h | 2 +- .../Viewport/MaterialViewportRequestBus.h | 0 .../Viewport/MaterialViewportSettings.cpp | 2 +- .../Viewport/MaterialViewportSettings.h | 0 .../Viewport/PerformanceMetrics.h | 0 .../Viewport/PerformanceMonitorComponent.cpp | 2 +- .../Viewport/PerformanceMonitorComponent.h | 5 +- .../Viewport/PerformanceMonitorRequestBus.h | 3 +- .../CreateMaterialDialog.cpp | 2 +- .../CreateMaterialDialog.h | 2 +- .../Source/Window/HelpDialog/HelpDialog.cpp | 4 +- .../Source/Window/HelpDialog/HelpDialog.h | 2 +- .../Source/Window/MaterialEditorWindow.cpp | 4 +- .../Window/MaterialEditorWindowComponent.cpp | 89 --------------- .../Window/MaterialEditorWindowComponent.h | 58 ---------- .../Window/MaterialEditorWindowModule.cpp | 38 ------- .../Window/MaterialEditorWindowSettings.cpp | 2 +- .../Window/MaterialEditorWindowSettings.h | 0 .../MaterialInspector/MaterialInspector.cpp | 2 +- .../MaterialInspector/MaterialInspector.h | 2 +- .../PerformanceMonitorWidget.cpp | 9 +- .../LightingPresetBrowserDialog.cpp | 2 +- .../LightingPresetBrowserDialog.h | 2 +- .../ModelPresetBrowserDialog.cpp | 2 +- .../ModelPresetBrowserDialog.h | 2 +- .../Window/SettingsDialog/SettingsWidget.h | 2 +- .../Window/ToolBar/LightingPresetComboBox.cpp | 6 +- .../Window/ToolBar/LightingPresetComboBox.h | 2 +- .../Window/ToolBar/MaterialEditorToolBar.cpp | 8 +- .../Window/ToolBar/MaterialEditorToolBar.h | 2 +- .../Window/ToolBar/ModelPresetComboBox.cpp | 6 +- .../Window/ToolBar/ModelPresetComboBox.h | 2 +- .../ViewportSettingsInspector.cpp | 4 +- .../ViewportSettingsInspector.h | 6 +- .../Code/materialeditor_files.cmake | 82 ++++++++++++++ .../Code/materialeditordocument_files.cmake | 19 ---- .../Code/materialeditorviewport_files.cmake | 46 -------- .../Code/materialeditorwindow_files.cmake | 52 --------- .../ShaderManagementConsoleWindowComponent.h | 12 +- .../ShaderManagementConsoleToolBar.cpp | 4 +- 80 files changed, 327 insertions(+), 736 deletions(-) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Document/MaterialDocumentRequestBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Document/MaterialDocumentSettings.h (100%) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/InputController/MaterialEditorViewportInputControllerBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportModule.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportNotificationBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportRequestBus.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/MaterialViewportSettings.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/PerformanceMetrics.h (100%) rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Viewport/PerformanceMonitorRequestBus.h (95%) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp rename Gems/Atom/Tools/MaterialEditor/Code/{Include/Atom => Source}/Window/MaterialEditorWindowSettings.h (100%) delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake delete mode 100644 Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp index 51e8bc4dda..7b6be61050 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Application/AtomToolsApplication.cpp @@ -158,6 +158,7 @@ namespace AtomToolsFramework components.end(), { azrtti_typeid(), + azrtti_typeid(), azrtti_typeid(), azrtti_typeid(), azrtti_typeid(), @@ -187,6 +188,9 @@ namespace AtomToolsFramework AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotificationBus::Broadcast( &AzToolsFramework::AssetBrowser::AssetDatabaseLocationNotifications::OnDatabaseInitialized); + AzToolsFramework::SourceControlConnectionRequestBus::Broadcast( + &AzToolsFramework::SourceControlConnectionRequests::EnableSourceControl, true); + if (!AZ::RPI::RPISystemInterface::Get()->IsInitialized()) { AZ::RPI::RPISystemInterface::Get()->InitializeSystemAssets(); diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp index a8481ef5bd..adba947092 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/AtomToolsFrameworkSystemComponent.cpp @@ -30,7 +30,7 @@ namespace AtomToolsFramework { ec->Class("AtomToolsFrameworkSystemComponent", "") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b)) + ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System")) ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ; } @@ -39,12 +39,12 @@ namespace AtomToolsFramework void AtomToolsFrameworkSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("AtomToolsFrameworkSystemService")); + provided.push_back(AZ_CRC_CE("AtomToolsFrameworkSystemService")); } void AtomToolsFrameworkSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) { - incompatible.push_back(AZ_CRC("AtomToolsFrameworkSystemService")); + incompatible.push_back(AZ_CRC_CE("AtomToolsFrameworkSystemService")); } void AtomToolsFrameworkSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp index d4599b68b7..830f71933c 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/DynamicProperty/DynamicProperty.cpp @@ -160,7 +160,7 @@ namespace AtomToolsFramework ApplyRangeEditDataAttributes(); break; case DynamicPropertyType::Color: - AddEditDataAttribute(AZ_CRC("ColorEditorConfiguration", 0xc8b9510e), AZ::RPI::ColorUtils::GetRgbEditorConfig()); + AddEditDataAttribute(AZ_CRC_CE("ColorEditorConfiguration"), AZ::RPI::ColorUtils::GetRgbEditorConfig()); break; case DynamicPropertyType::Enum: m_editData.m_elementId = AZ::Edit::UIHandlers::ComboBox; diff --git a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp index fbe188364a..89f7e9d3bf 100644 --- a/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp +++ b/Gems/Atom/Tools/AtomToolsFramework/Code/Source/Inspector/InspectorWidget.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include namespace AtomToolsFramework { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt index 1d9295f9b3..5a0d153578 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt +++ b/Gems/Atom/Tools/MaterialEditor/Code/CMakeLists.txt @@ -18,78 +18,12 @@ if(NOT PAL_TRAIT_ATOM_MATERIAL_EDITOR_APPLICATION_SUPPORTED) return() endif() - -ly_add_target( - NAME MaterialEditor.Document STATIC - NAMESPACE Gem - AUTOMOC - FILES_CMAKE - materialeditordocument_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - Source - PUBLIC - Include - BUILD_DEPENDENCIES - PUBLIC - Gem::AtomToolsFramework.Static - Gem::AtomToolsFramework.Editor - Gem::Atom_RPI.Edit - Gem::Atom_RPI.Public - Gem::Atom_RHI.Reflect -) - -ly_add_target( - NAME MaterialEditor.Window STATIC - NAMESPACE Gem - AUTOMOC - AUTOUIC - AUTORCC - FILES_CMAKE - materialeditorwindow_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - Source - PUBLIC - Include - BUILD_DEPENDENCIES - PUBLIC - Gem::AtomToolsFramework.Static - Gem::AtomToolsFramework.Editor - Gem::Atom_RPI.Public - Gem::Atom_Feature_Common.Public -) - -ly_add_target( - NAME MaterialEditor.Viewport STATIC - NAMESPACE Gem - AUTOMOC - AUTOUIC - FILES_CMAKE - materialeditorviewport_files.cmake - INCLUDE_DIRECTORIES - PRIVATE - . - Source - Public - Include - BUILD_DEPENDENCIES - PUBLIC - Gem::AtomToolsFramework.Static - Gem::AtomToolsFramework.Editor - Gem::Atom_RHI.Public - Gem::Atom_RPI.Public - Gem::Atom_Feature_Common.Static - Gem::Atom_Component_DebugCamera.Static - Gem::AtomLyIntegration_CommonFeatures.Static -) - ly_add_target( NAME MaterialEditor EXECUTABLE NAMESPACE Gem AUTOMOC + AUTOUIC + AUTORCC FILES_CMAKE materialeditor_files.cmake ${pal_source_dir}/platform_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake @@ -106,9 +40,13 @@ ly_add_target( PRIVATE Gem::AtomToolsFramework.Static Gem::AtomToolsFramework.Editor - Gem::MaterialEditor.Window - Gem::MaterialEditor.Viewport - Gem::MaterialEditor.Document + Gem::Atom_RHI.Public + Gem::Atom_RHI.Reflect + Gem::Atom_RPI.Edit + Gem::Atom_RPI.Public + Gem::Atom_Feature_Common.Public + Gem::Atom_Component_DebugCamera.Static + Gem::AtomLyIntegration_CommonFeatures.Static RUNTIME_DEPENDENCIES Gem::AtomToolsFramework.Editor Gem::EditorPythonBindings.Editor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.h deleted file mode 100644 index 0813f8cab8..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentModule.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 - -namespace MaterialEditor -{ - //! Entry point for Material Editor Document library. This module is responsible for registering dependencies and logic needed - //! for the Material Document API - class MaterialDocumentModule - : public AZ::Module - { - public: - AZ_RTTI(MaterialDocumentModule, "{81D7A170-9284-4DE9-8D92-B6B94E8A2BDF}", AZ::Module); - AZ_CLASS_ALLOCATOR(MaterialDocumentModule, AZ::SystemAllocator, 0); - - MaterialDocumentModule(); - - //! Add required SystemComponents to the SystemEntity. - AZ::ComponentTypeList GetRequiredSystemComponents() const override; - }; -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.h deleted file mode 100644 index 611a993084..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowModule.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 - -namespace MaterialEditor -{ - //! Entry point for Material Editor Window library. - class MaterialEditorWindowModule - : public AZ::Module - { - public: - AZ_RTTI(MaterialEditorWindowModule, "{57D6239C-AE03-4ED8-9125-35C5B1625503}", AZ::Module); - AZ_CLASS_ALLOCATOR(MaterialEditorWindowModule, AZ::SystemAllocator, 0); - - MaterialEditorWindowModule(); - - //! Add required SystemComponents to the SystemEntity. - AZ::ComponentTypeList GetRequiredSystemComponents() const override; - }; -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h index ceb3190f26..c975824e22 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocument.h @@ -7,18 +7,17 @@ */ #pragma once -#include #include #include -#include +#include #include -#include #include #include #include -#include +#include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp deleted file mode 100644 index c721798cfd..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentModule.cpp +++ /dev/null @@ -1,30 +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 -#include -#include - -namespace MaterialEditor -{ - MaterialDocumentModule::MaterialDocumentModule() - { - // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here. - m_descriptors.insert(m_descriptors.end(), { - MaterialDocumentSystemComponent::CreateDescriptor(), - }); - } - - AZ::ComponentTypeList MaterialDocumentModule::GetRequiredSystemComponents() const - { - return AZ::ComponentTypeList{ - azrtti_typeid(), - azrtti_typeid(), - }; - } -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentRequestBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentRequestBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentRequestBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp index 4823b8c67c..256497de54 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.cpp @@ -6,9 +6,9 @@ * */ -#include #include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Document/MaterialDocumentSettings.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSettings.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp deleted file mode 100644 index 9302b5ac5c..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.cpp +++ /dev/null @@ -1,85 +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 -#include -#include -#include -#include -#include -#include -#include - -namespace MaterialEditor -{ - void MaterialDocumentSystemComponent::Reflect(AZ::ReflectContext* context) - { - MaterialDocumentSettings::Reflect(context); - - if (AZ::SerializeContext* serialize = azrtti_cast(context)) - { - serialize->Class() - ->Version(0); - - if (AZ::EditContext* ec = serialize->GetEditContext()) - { - ec->Class("MaterialDocumentSystemComponent", "Tool for editing Atom material files") - ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System")) - ->Attribute(AZ::Edit::Attributes::AutoExpand, true) - ; - } - } - - if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) - { - behaviorContext->EBus("MaterialDocumentRequestBus") - ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common) - ->Attribute(AZ::Script::Attributes::Category, "Editor") - ->Attribute(AZ::Script::Attributes::Module, "materialeditor") - ; - } - } - - void MaterialDocumentSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) - { - required.push_back(AZ_CRC_CE("AtomToolsDocumentSystemService")); - required.push_back(AZ_CRC_CE("AssetProcessorToolsConnection")); - required.push_back(AZ_CRC_CE("AssetDatabaseService")); - required.push_back(AZ_CRC_CE("PropertyManagerService")); - required.push_back(AZ_CRC_CE("RPISystem")); - } - - void MaterialDocumentSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) - { - provided.push_back(AZ_CRC_CE("MaterialDocumentSystemService")); - } - - void MaterialDocumentSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) - { - incompatible.push_back(AZ_CRC_CE("MaterialDocumentSystemService")); - } - - void MaterialDocumentSystemComponent::Init() - { - } - - void MaterialDocumentSystemComponent::Activate() - { - AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast( - &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType, - []() - { - return aznew MaterialDocument(); - }); - } - - void MaterialDocumentSystemComponent::Deactivate() - { - } -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h deleted file mode 100644 index af19956088..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Document/MaterialDocumentSystemComponent.h +++ /dev/null @@ -1,41 +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 - -namespace MaterialEditor -{ - //! MaterialDocumentSystemComponent - class MaterialDocumentSystemComponent - : public AZ::Component - { - public: - AZ_COMPONENT(MaterialDocumentSystemComponent, "{E011DA51-855D-45FA-87A3-1C1CD6379091}"); - - MaterialDocumentSystemComponent() = default; - ~MaterialDocumentSystemComponent() = default; - MaterialDocumentSystemComponent(const MaterialDocumentSystemComponent&) = delete; - MaterialDocumentSystemComponent& operator=(const MaterialDocumentSystemComponent&) = delete; - - static void Reflect(AZ::ReflectContext* context); - - static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); - static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided); - static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible); - - private: - //////////////////////////////////////////////////////////////////////// - // AZ::Component interface implementation - void Init() override; - void Activate() override; - void Deactivate() override; - //////////////////////////////////////////////////////////////////////// - }; -} // namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp index 15a5ff1715..2e64740057 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.cpp @@ -6,22 +6,73 @@ * */ -#include -#include -#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include #include +#include +#include +#include + +void InitMaterialEditorResources() +{ + // Must register qt resources from other modules + Q_INIT_RESOURCE(MaterialEditor); + Q_INIT_RESOURCE(InspectorWidget); + Q_INIT_RESOURCE(AtomToolsAssetBrowser); +} namespace MaterialEditor { - //! This function returns the build system target name of "MaterialEditor" - AZStd::string MaterialEditorApplication::GetBuildTargetName() const + MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv) + : Base(argc, argv) { -#if !defined(LY_CMAKE_TARGET) -#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target" -#endif - return AZStd::string{ LY_CMAKE_TARGET }; + InitMaterialEditorResources(); + + QApplication::setApplicationName("O3DE Material Editor"); + + // The settings registry has been created at this point, so add the CMake target + AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization( + *AZ::SettingsRegistry::Get(), GetBuildTargetName()); + + AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect(); + AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusConnect(); + } + + MaterialEditorApplication::~MaterialEditorApplication() + { + AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusDisconnect(); + AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect(); + m_window.reset(); + } + + void MaterialEditorApplication::Reflect(AZ::ReflectContext* context) + { + Base::Reflect(context); + MaterialDocumentSettings::Reflect(context); + MaterialEditorWindowSettings::Reflect(context); + + if (AZ::BehaviorContext* behaviorContext = azrtti_cast(context)) + { + behaviorContext->EBus("MaterialDocumentRequestBus") + ->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common) + ->Attribute(AZ::Script::Attributes::Category, "Editor") + ->Attribute(AZ::Script::Attributes::Module, "materialeditor") + ; + } + } + + void MaterialEditorApplication::CreateStaticModules(AZStd::vector& outModules) + { + Base::CreateStaticModules(outModules); + outModules.push_back(aznew MaterialViewportModule); } const char* MaterialEditorApplication::GetCurrentConfigurationName() const @@ -35,26 +86,42 @@ namespace MaterialEditor #endif } - MaterialEditorApplication::MaterialEditorApplication(int* argc, char*** argv) - : Base(argc, argv) + void MaterialEditorApplication::StartCommon(AZ::Entity* systemEntity) { - QApplication::setApplicationName("O3DE Material Editor"); + Base::StartCommon(systemEntity); - // The settings registry has been created at this point, so add the CMake target - AZ::SettingsRegistryMergeUtils::MergeSettingsToRegistry_AddBuildSystemTargetSpecialization( - *AZ::SettingsRegistry::Get(), GetBuildTargetName()); + AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Broadcast( + &AtomToolsFramework::AtomToolsDocumentSystemRequestBus::Handler::RegisterDocumentType, + []() { return aznew MaterialDocument(); }); } - void MaterialEditorApplication::CreateStaticModules(AZStd::vector& outModules) + AZStd::string MaterialEditorApplication::GetBuildTargetName() const { - Base::CreateStaticModules(outModules); - outModules.push_back(aznew MaterialDocumentModule); - outModules.push_back(aznew MaterialViewportModule); - outModules.push_back(aznew MaterialEditorWindowModule); +#if !defined(LY_CMAKE_TARGET) +#error "LY_CMAKE_TARGET must be defined in order to add this source file to a CMake executable target" +#endif + //! Returns the build system target name of "MaterialEditor" + return AZStd::string{ LY_CMAKE_TARGET }; } AZStd::vector MaterialEditorApplication::GetCriticalAssetFilters() const { return AZStd::vector({ "passes/", "config/", "MaterialEditor/" }); } + + void MaterialEditorApplication::CreateMainWindow() + { + m_materialEditorBrowserInteractions.reset(aznew MaterialEditorBrowserInteractions); + m_window.reset(aznew MaterialEditorWindow); + } + + void MaterialEditorApplication::DestroyMainWindow() + { + m_window.reset(); + } + + QWidget* MaterialEditorApplication::GetAppMainWindow() + { + return m_window.get(); + } } // namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h index bf2e6f6ca1..060353e396 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/MaterialEditorApplication.h @@ -9,6 +9,10 @@ #pragma once #include +#include +#include +#include +#include namespace MaterialEditor { @@ -16,6 +20,8 @@ namespace MaterialEditor class MaterialEditorApplication : public AtomToolsFramework::AtomToolsDocumentApplication + , private AzToolsFramework::EditorWindowRequestBus::Handler + , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler { public: AZ_TYPE_INFO(MaterialEditor::MaterialEditorApplication, "{30F90CA5-1253-49B5-8143-19CEE37E22BB}"); @@ -23,13 +29,26 @@ namespace MaterialEditor using Base = AtomToolsFramework::AtomToolsDocumentApplication; MaterialEditorApplication(int* argc, char*** argv); + ~MaterialEditorApplication(); // AzFramework::Application overrides... + void Reflect(AZ::ReflectContext* context) override; void CreateStaticModules(AZStd::vector& outModules) override; const char* GetCurrentConfigurationName() const override; + void StartCommon(AZ::Entity* systemEntity) override; // AtomToolsFramework::AtomToolsApplication overrides... AZStd::string GetBuildTargetName() const override; AZStd::vector GetCriticalAssetFilters() const override; + + // AtomToolsMainWindowFactoryRequestBus::Handler overrides... + void CreateMainWindow() override; + void DestroyMainWindow() override; + + // AzToolsFramework::EditorWindowRequests::Bus::Handler + QWidget* GetAppMainWindow() override; + + AZStd::unique_ptr m_window; + AZStd::unique_ptr m_materialEditorBrowserInteractions; }; } // namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp index 321b79ba87..a843c4965c 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/Behavior.cpp @@ -6,10 +6,9 @@ * */ -#include #include - -#include +#include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp index c0326bce2a..c69884c5c0 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.cpp @@ -6,11 +6,11 @@ * */ +#include #include #include -#include +#include #include -#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h index be226e5fde..5debfc4dd1 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/DollyCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp index 64e2fe1fdc..0cd062d86d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.cpp @@ -6,7 +6,7 @@ * */ -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h index 3eec594da2..16543a890d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/IdleBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp index 1784405ffa..ced59f1bf5 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.cpp @@ -9,30 +9,30 @@ #include #include -#include #include #include +#include +#include #include #include -#include #include #include -#include +#include #include #include #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h index b488c3bf29..a68666f06d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputController.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp index a449d6f7ff..80b3409f57 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.cpp @@ -6,10 +6,10 @@ * */ -#include #include -#include -#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h index b37350423f..ea0850ba16 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/MoveCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp index 4d8a5b9343..1d93e4eafe 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.cpp @@ -7,8 +7,8 @@ */ #include -#include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h index 98240aef96..a312d22e73 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/OrbitCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp index 62839be13c..2b036a1319 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.cpp @@ -6,11 +6,11 @@ * */ -#include -#include #include -#include -#include +#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h index de8e2c3c43..93233511f0 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/PanCameraBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp index 17fb3f3e52..894841becd 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h index 80989df520..56c7a5190a 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateEnvironmentBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace AZ { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp index 032b412d6e..ed09ae8fa3 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h index 7653e10014..e2c20ab5fd 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/InputController/RotateModelBehavior.h @@ -7,7 +7,7 @@ */ #pragma once -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp index 9cf714b40e..b2f1cdc9c1 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.cpp @@ -9,19 +9,19 @@ #include #include #include -#include -#include #include #include #include #include #include +#include #include #include -#include #include #include #include +#include +#include namespace MaterialEditor { @@ -42,7 +42,7 @@ namespace MaterialEditor { editContext->Class("MaterialViewport", "Manages configurations for lighting and models displayed in the viewport") ->ClassElement(AZ::Edit::ClassElements::EditorData, "") - ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System", 0xc94d118b)) + ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System")) ->Attribute(AZ::Edit::Attributes::AutoExpand, true) ; } @@ -103,18 +103,19 @@ namespace MaterialEditor void MaterialViewportComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required) { - required.push_back(AZ_CRC("PerformanceMonitorService", 0x6a44241a)); - required.push_back(AZ_CRC("AtomImageBuilderService", 0x76ded592)); + required.push_back(AZ_CRC_CE("RPISystem")); + required.push_back(AZ_CRC_CE("AssetDatabaseService")); + required.push_back(AZ_CRC_CE("PerformanceMonitorService")); } void MaterialViewportComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("MaterialViewportService", 0xed9b44d7)); + provided.push_back(AZ_CRC_CE("MaterialViewportService")); } void MaterialViewportComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) { - incompatible.push_back(AZ_CRC("MaterialViewportService", 0xed9b44d7)); + incompatible.push_back(AZ_CRC_CE("MaterialViewportService")); } void MaterialViewportComponent::Init() diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h index 68668bd804..7209dfa489 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportComponent.h @@ -12,11 +12,11 @@ #include #include #include -#include -#include #include #include #include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp index 7c3bc208ff..01a13519fb 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.cpp @@ -6,8 +6,8 @@ * */ -#include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportModule.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportModule.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportNotificationBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportNotificationBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportNotificationBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp index 409674f0bc..478fb92c55 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.cpp @@ -8,51 +8,51 @@ #undef RC_INVOKED -#include #include +#include -#include #include +#include #include #include -#include +#include +#include #include #include #include #include -#include -#include +#include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include -#include #include #include -#include -#include -#include -#include #include +#include #include #include -#include #include -#include +#include #include -#include +#include #include #include +#include -#include +#include +#include +#include +#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h index c6380ddc00..35b7965a2e 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRenderer.h @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include namespace AZ { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRequestBus.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportRequestBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportRequestBus.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp index c2c35119c2..0f08716407 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.cpp @@ -6,9 +6,9 @@ * */ -#include #include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/MaterialViewportSettings.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/MaterialViewportSettings.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMetrics.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMetrics.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMetrics.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp index 563b2754df..c8f12480b5 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.cpp @@ -31,7 +31,7 @@ namespace MaterialEditor void PerformanceMonitorComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) { - provided.push_back(AZ_CRC("PerformanceMonitorService", 0x6a44241a)); + provided.push_back(AZ_CRC_CE("PerformanceMonitorService")); } void PerformanceMonitorComponent::Init() diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h index 88a6827bd1..3045bf9533 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorComponent.h @@ -8,11 +8,10 @@ #pragma once +#include #include #include - -#include -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorRequestBus.h similarity index 95% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorRequestBus.h index ae09064766..6001787d99 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Viewport/PerformanceMonitorRequestBus.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Viewport/PerformanceMonitorRequestBus.h @@ -8,8 +8,7 @@ #pragma once #include - -#include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp index 31ca873c48..0e6cf565e3 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include @@ -15,6 +14,7 @@ #include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h index 3453d8347c..ed3cb2773b 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/CreateMaterialDialog/CreateMaterialDialog.h @@ -10,7 +10,7 @@ #include -#include +#include #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp index 3ad41e4803..3e8cf19539 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.cpp @@ -6,7 +6,7 @@ * */ -#include +#include namespace MaterialEditor { @@ -20,4 +20,4 @@ namespace MaterialEditor HelpDialog::~HelpDialog() = default; } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h index 5cca57ad2d..ec5b756df4 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/HelpDialog/HelpDialog.h @@ -13,7 +13,7 @@ AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include -#include +#include AZ_POP_DISABLE_WARNING #endif diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp index 44adda432d..e1f8e713d4 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp @@ -6,19 +6,19 @@ * */ -#include #include #include #include -#include #include #include #include #include +#include #include #include #include #include +#include #include #include #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp deleted file mode 100644 index 5359ba8e53..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.cpp +++ /dev/null @@ -1,89 +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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace MaterialEditor -{ - void MaterialEditorWindowComponent::Reflect(AZ::ReflectContext* context) - { - MaterialEditorWindowSettings::Reflect(context); - - if (AZ::SerializeContext* serialize = azrtti_cast(context)) - { - serialize->Class() - ->Version(0); - } - } - - void MaterialEditorWindowComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required) - { - required.push_back(AZ_CRC_CE("AssetBrowserService")); - required.push_back(AZ_CRC_CE("PropertyManagerService")); - required.push_back(AZ_CRC_CE("SourceControlService")); - required.push_back(AZ_CRC_CE("AtomToolsMainWindowSystemService")); - } - - void MaterialEditorWindowComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided) - { - provided.push_back(AZ_CRC_CE("MaterialEditorWindowService")); - } - - void MaterialEditorWindowComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible) - { - incompatible.push_back(AZ_CRC_CE("MaterialEditorWindowService")); - } - - void MaterialEditorWindowComponent::Init() - { - } - - void MaterialEditorWindowComponent::Activate() - { - AzToolsFramework::EditorWindowRequestBus::Handler::BusConnect(); - AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusConnect(); - AzToolsFramework::SourceControlConnectionRequestBus::Broadcast(&AzToolsFramework::SourceControlConnectionRequests::EnableSourceControl, true); - } - - void MaterialEditorWindowComponent::Deactivate() - { - AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler::BusDisconnect(); - AzToolsFramework::EditorWindowRequestBus::Handler::BusDisconnect(); - - m_window.reset(); - } - - void MaterialEditorWindowComponent::CreateMainWindow() - { - m_materialEditorBrowserInteractions.reset(aznew MaterialEditorBrowserInteractions); - - m_window.reset(aznew MaterialEditorWindow); - } - - void MaterialEditorWindowComponent::DestroyMainWindow() - { - m_window.reset(); - } - - QWidget* MaterialEditorWindowComponent::GetAppMainWindow() - { - return m_window.get(); - } - -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h deleted file mode 100644 index 87f6160089..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowComponent.h +++ /dev/null @@ -1,58 +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 -#include - -namespace MaterialEditor -{ - //! MaterialEditorWindowComponent is the entry point for the Material Editor gem user interface, and is mainly - //! used for initialization and registration of other classes, including MaterialEditorWindow. - class MaterialEditorWindowComponent - : public AZ::Component - , private AzToolsFramework::EditorWindowRequestBus::Handler - , private AtomToolsFramework::AtomToolsMainWindowFactoryRequestBus::Handler - { - public: - AZ_COMPONENT(MaterialEditorWindowComponent, "{03976F19-3C74-49FE-A15F-7D3CADBA616C}"); - - static void Reflect(AZ::ReflectContext* context); - - static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required); - static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided); - static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible); - - private: - //////////////////////////////////////////////////////////////////////// - // AtomToolsMainWindowFactoryRequestBus::Handler overrides... - void CreateMainWindow() override; - void DestroyMainWindow() override; - //////////////////////////////////////////////////////////////////////// - - ////////////////////////////////////////////////////////////////////////// - // AzToolsFramework::EditorWindowRequests::Bus::Handler - QWidget* GetAppMainWindow() override; - ////////////////////////////////////////////////////////////////////////// - - //////////////////////////////////////////////////////////////////////// - // AZ::Component interface implementation - void Init() override; - void Activate() override; - void Deactivate() override; - //////////////////////////////////////////////////////////////////////// - - AZStd::unique_ptr m_window; - AZStd::unique_ptr m_materialEditorBrowserInteractions; - }; -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp deleted file mode 100644 index 1562d11647..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowModule.cpp +++ /dev/null @@ -1,38 +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 -#include - -void InitMaterialEditorResources() -{ - //Must register qt resources from other modules - Q_INIT_RESOURCE(MaterialEditor); - Q_INIT_RESOURCE(InspectorWidget); - Q_INIT_RESOURCE(AtomToolsAssetBrowser); -} - -namespace MaterialEditor -{ - MaterialEditorWindowModule::MaterialEditorWindowModule() - { - InitMaterialEditorResources(); - - // Push results of [MyComponent]::CreateDescriptor() into m_descriptors here. - m_descriptors.insert(m_descriptors.end(), { - MaterialEditorWindowComponent::CreateDescriptor(), - }); - } - - AZ::ComponentTypeList MaterialEditorWindowModule::GetRequiredSystemComponents() const - { - return AZ::ComponentTypeList{ - azrtti_typeid(), - }; - } -} diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp index 71c71e8b75..5ab17d7b26 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.cpp @@ -6,9 +6,9 @@ * */ -#include #include #include +#include namespace MaterialEditor { diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.h similarity index 100% rename from Gems/Atom/Tools/MaterialEditor/Code/Include/Atom/Window/MaterialEditorWindowSettings.h rename to Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindowSettings.h diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp index e99f456653..7790b9bef5 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.cpp @@ -6,7 +6,6 @@ * */ -#include #include #include #include @@ -15,6 +14,7 @@ #include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h index a3b98e13d2..a4cd2b7616 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialInspector/MaterialInspector.h @@ -9,12 +9,12 @@ #pragma once #if !defined(Q_MOC_RUN) -#include #include #include #include #include #include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp index 940790eb0a..8492ce5f1f 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp @@ -6,10 +6,9 @@ * */ -#include - -#include -#include +#include +#include +#include #include @@ -55,4 +54,4 @@ namespace MaterialEditor } } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp index f8ad038a85..cc7a851429 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp @@ -8,9 +8,9 @@ #include #include -#include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h index f9d455d915..68b52b3a98 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h @@ -10,8 +10,8 @@ #if !defined(Q_MOC_RUN) #include -#include #include +#include #endif #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp index f5a1677462..e16b61d214 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp @@ -7,9 +7,9 @@ */ #include -#include #include #include +#include #include namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h index 67da7db262..a169d3053b 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h @@ -10,8 +10,8 @@ #if !defined(Q_MOC_RUN) #include -#include #include +#include #endif #include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h index fea98eeda1..e7c655ee21 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/SettingsDialog/SettingsWidget.h @@ -9,10 +9,10 @@ #pragma once #if !defined(Q_MOC_RUN) -#include #include #include #include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp index e0bb59cb82..20229cad37 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.cpp @@ -6,9 +6,9 @@ * */ -#include -#include #include +#include +#include namespace MaterialEditor { @@ -102,4 +102,4 @@ namespace MaterialEditor } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h index 4c452dfb5b..f39b856085 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/LightingPresetComboBox.h @@ -10,7 +10,7 @@ #if !defined(Q_MOC_RUN) #include -#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp index 10442e0c27..25877f910d 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.cpp @@ -6,21 +6,21 @@ * */ -#include -#include -#include #include +#include +#include +#include #include #include #include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include +#include #include #include #include #include -#include AZ_POP_DISABLE_WARNING namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h index c25b90eb80..056fb3ba80 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/MaterialEditorToolBar.h @@ -11,7 +11,7 @@ #if !defined(Q_MOC_RUN) #include #include -#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp index 1e8bfec485..1c9bd36be4 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.cpp @@ -6,9 +6,9 @@ * */ -#include -#include #include +#include +#include namespace MaterialEditor { @@ -102,4 +102,4 @@ namespace MaterialEditor } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h index e315854d75..bb71cec25b 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ToolBar/ModelPresetComboBox.h @@ -10,7 +10,7 @@ #if !defined(Q_MOC_RUN) #include -#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp index 613762c10a..512059f1f6 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp @@ -7,10 +7,10 @@ */ #include -#include #include #include #include +#include #include #include #include @@ -376,4 +376,4 @@ namespace MaterialEditor } // namespace MaterialEditor -#include +#include diff --git a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h index 6299ddb1f2..464a55aa7f 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h +++ b/Gems/Atom/Tools/MaterialEditor/Code/Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h @@ -12,11 +12,11 @@ #include #include #include -#include -#include -#include #include #include +#include +#include +#include #endif namespace MaterialEditor diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake index d4c4364ba7..9d1e2b22f8 100644 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake +++ b/Gems/Atom/Tools/MaterialEditor/Code/materialeditor_files.cmake @@ -10,4 +10,86 @@ set(FILES Source/main.cpp Source/MaterialEditorApplication.cpp Source/MaterialEditorApplication.h + + Source/Document/MaterialDocumentRequestBus.h + Source/Document/MaterialDocumentSettings.h + Source/Document/MaterialDocument.cpp + Source/Document/MaterialDocument.h + Source/Document/MaterialDocumentSettings.cpp + + Source/Viewport/MaterialViewportModule.h + Source/Viewport/MaterialViewportModule.cpp + Source/Viewport/InputController/MaterialEditorViewportInputControllerBus.h + Source/Viewport/MaterialViewportSettings.h + Source/Viewport/MaterialViewportRequestBus.h + Source/Viewport/MaterialViewportNotificationBus.h + Source/Viewport/PerformanceMetrics.h + Source/Viewport/PerformanceMonitorRequestBus.h + Source/Viewport/InputController/MaterialEditorViewportInputController.cpp + Source/Viewport/InputController/MaterialEditorViewportInputController.h + Source/Viewport/InputController/Behavior.cpp + Source/Viewport/InputController/Behavior.h + Source/Viewport/InputController/DollyCameraBehavior.cpp + Source/Viewport/InputController/DollyCameraBehavior.h + Source/Viewport/InputController/IdleBehavior.cpp + Source/Viewport/InputController/IdleBehavior.h + Source/Viewport/InputController/MoveCameraBehavior.cpp + Source/Viewport/InputController/MoveCameraBehavior.h + Source/Viewport/InputController/PanCameraBehavior.cpp + Source/Viewport/InputController/PanCameraBehavior.h + Source/Viewport/InputController/OrbitCameraBehavior.cpp + Source/Viewport/InputController/OrbitCameraBehavior.h + Source/Viewport/InputController/RotateEnvironmentBehavior.cpp + Source/Viewport/InputController/RotateEnvironmentBehavior.h + Source/Viewport/InputController/RotateModelBehavior.cpp + Source/Viewport/InputController/RotateModelBehavior.h + Source/Viewport/MaterialViewportSettings.cpp + Source/Viewport/MaterialViewportComponent.cpp + Source/Viewport/MaterialViewportComponent.h + Source/Viewport/MaterialViewportWidget.cpp + Source/Viewport/MaterialViewportWidget.h + Source/Viewport/MaterialViewportWidget.ui + Source/Viewport/MaterialViewportRenderer.cpp + Source/Viewport/MaterialViewportRenderer.h + Source/Viewport/PerformanceMonitorComponent.cpp + Source/Viewport/PerformanceMonitorComponent.h + + Source/Window/MaterialEditorWindowSettings.h + Source/Window/MaterialEditorBrowserInteractions.h + Source/Window/MaterialEditorBrowserInteractions.cpp + Source/Window/MaterialEditorWindow.h + Source/Window/MaterialEditorWindow.cpp + Source/Window/MaterialEditorWindowSettings.cpp + Source/Window/MaterialEditor.qrc + Source/Window/MaterialEditor.qss + Source/Window/SettingsDialog/SettingsDialog.cpp + Source/Window/SettingsDialog/SettingsDialog.h + Source/Window/SettingsDialog/SettingsWidget.cpp + Source/Window/SettingsDialog/SettingsWidget.h + Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp + Source/Window/CreateMaterialDialog/CreateMaterialDialog.h + Source/Window/CreateMaterialDialog/CreateMaterialDialog.ui + Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp + Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h + Source/Window/PresetBrowserDialogs/PresetBrowserDialog.ui + Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp + Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h + Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp + Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h + Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp + Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h + Source/Window/PerformanceMonitor/PerformanceMonitorWidget.ui + Source/Window/ToolBar/MaterialEditorToolBar.h + Source/Window/ToolBar/MaterialEditorToolBar.cpp + Source/Window/ToolBar/ModelPresetComboBox.h + Source/Window/ToolBar/ModelPresetComboBox.cpp + Source/Window/ToolBar/LightingPresetComboBox.h + Source/Window/ToolBar/LightingPresetComboBox.cpp + Source/Window/MaterialInspector/MaterialInspector.h + Source/Window/MaterialInspector/MaterialInspector.cpp + Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h + Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp + Source/Window/HelpDialog/HelpDialog.h + Source/Window/HelpDialog/HelpDialog.cpp + Source/Window/HelpDialog/HelpDialog.ui ) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake deleted file mode 100644 index d86dd03749..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditordocument_files.cmake +++ /dev/null @@ -1,19 +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 - Include/Atom/Document/MaterialDocumentModule.h - Include/Atom/Document/MaterialDocumentRequestBus.h - Include/Atom/Document/MaterialDocumentSettings.h - Source/Document/MaterialDocumentModule.cpp - Source/Document/MaterialDocumentSystemComponent.cpp - Source/Document/MaterialDocumentSystemComponent.h - Source/Document/MaterialDocument.cpp - Source/Document/MaterialDocument.h - Source/Document/MaterialDocumentSettings.cpp -) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake deleted file mode 100644 index ba34cabd90..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorviewport_files.cmake +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (c) Contributors to the Open 3D Engine Project. -# For complete copyright and license terms please see the LICENSE at the root of this distribution. -# -# SPDX-License-Identifier: Apache-2.0 OR MIT -# -# - -set(FILES - Include/Atom/Viewport/InputController/MaterialEditorViewportInputControllerBus.h - Include/Atom/Viewport/MaterialViewportModule.h - Include/Atom/Viewport/MaterialViewportSettings.h - Include/Atom/Viewport/MaterialViewportRequestBus.h - Include/Atom/Viewport/MaterialViewportNotificationBus.h - Include/Atom/Viewport/PerformanceMetrics.h - Include/Atom/Viewport/PerformanceMonitorRequestBus.h - Source/Viewport/InputController/MaterialEditorViewportInputController.cpp - Source/Viewport/InputController/MaterialEditorViewportInputController.h - Source/Viewport/InputController/Behavior.cpp - Source/Viewport/InputController/Behavior.h - Source/Viewport/InputController/DollyCameraBehavior.cpp - Source/Viewport/InputController/DollyCameraBehavior.h - Source/Viewport/InputController/IdleBehavior.cpp - Source/Viewport/InputController/IdleBehavior.h - Source/Viewport/InputController/MoveCameraBehavior.cpp - Source/Viewport/InputController/MoveCameraBehavior.h - Source/Viewport/InputController/PanCameraBehavior.cpp - Source/Viewport/InputController/PanCameraBehavior.h - Source/Viewport/InputController/OrbitCameraBehavior.cpp - Source/Viewport/InputController/OrbitCameraBehavior.h - Source/Viewport/InputController/RotateEnvironmentBehavior.cpp - Source/Viewport/InputController/RotateEnvironmentBehavior.h - Source/Viewport/InputController/RotateModelBehavior.cpp - Source/Viewport/InputController/RotateModelBehavior.h - Source/Viewport/MaterialViewportModule.cpp - Source/Viewport/MaterialViewportSettings.cpp - Source/Viewport/MaterialViewportComponent.cpp - Source/Viewport/MaterialViewportComponent.h - Source/Viewport/MaterialViewportWidget.cpp - Source/Viewport/MaterialViewportWidget.h - Source/Viewport/MaterialViewportWidget.ui - Source/Viewport/MaterialViewportRenderer.cpp - Source/Viewport/MaterialViewportRenderer.h - Source/Viewport/PerformanceMonitorComponent.cpp - Source/Viewport/PerformanceMonitorComponent.h -) diff --git a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake b/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake deleted file mode 100644 index 3d21e71294..0000000000 --- a/Gems/Atom/Tools/MaterialEditor/Code/materialeditorwindow_files.cmake +++ /dev/null @@ -1,52 +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 - Include/Atom/Window/MaterialEditorWindowModule.h - Include/Atom/Window/MaterialEditorWindowSettings.h - Source/Window/MaterialEditorBrowserInteractions.h - Source/Window/MaterialEditorBrowserInteractions.cpp - Source/Window/MaterialEditorWindow.h - Source/Window/MaterialEditorWindow.cpp - Source/Window/MaterialEditorWindowModule.cpp - Source/Window/MaterialEditorWindowSettings.cpp - Source/Window/MaterialEditor.qrc - Source/Window/MaterialEditor.qss - Source/Window/MaterialEditorWindowComponent.h - Source/Window/MaterialEditorWindowComponent.cpp - Source/Window/SettingsDialog/SettingsDialog.cpp - Source/Window/SettingsDialog/SettingsDialog.h - Source/Window/SettingsDialog/SettingsWidget.cpp - Source/Window/SettingsDialog/SettingsWidget.h - Source/Window/CreateMaterialDialog/CreateMaterialDialog.cpp - Source/Window/CreateMaterialDialog/CreateMaterialDialog.h - Source/Window/CreateMaterialDialog/CreateMaterialDialog.ui - Source/Window/PresetBrowserDialogs/PresetBrowserDialog.cpp - Source/Window/PresetBrowserDialogs/PresetBrowserDialog.h - Source/Window/PresetBrowserDialogs/PresetBrowserDialog.ui - Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.cpp - Source/Window/PresetBrowserDialogs/LightingPresetBrowserDialog.h - Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.cpp - Source/Window/PresetBrowserDialogs/ModelPresetBrowserDialog.h - Source/Window/PerformanceMonitor/PerformanceMonitorWidget.cpp - Source/Window/PerformanceMonitor/PerformanceMonitorWidget.h - Source/Window/PerformanceMonitor/PerformanceMonitorWidget.ui - Source/Window/ToolBar/MaterialEditorToolBar.h - Source/Window/ToolBar/MaterialEditorToolBar.cpp - Source/Window/ToolBar/ModelPresetComboBox.h - Source/Window/ToolBar/ModelPresetComboBox.cpp - Source/Window/ToolBar/LightingPresetComboBox.h - Source/Window/ToolBar/LightingPresetComboBox.cpp - Source/Window/MaterialInspector/MaterialInspector.h - Source/Window/MaterialInspector/MaterialInspector.cpp - Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.h - Source/Window/ViewportSettingsInspector/ViewportSettingsInspector.cpp - Source/Window/HelpDialog/HelpDialog.h - Source/Window/HelpDialog/HelpDialog.cpp - Source/Window/HelpDialog/HelpDialog.ui -) diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h index 9b43babd9a..aab0f7ce37 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindowComponent.h @@ -8,15 +8,15 @@ #pragma once +#include +#include +#include + #include #include -#include - -#include -#include -#include -#include +#include +#include namespace ShaderManagementConsole { diff --git a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp index d65ac7048d..5699713240 100644 --- a/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp +++ b/Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ToolBar/ShaderManagementConsoleToolBar.cpp @@ -7,7 +7,7 @@ */ #include -#include +#include AZ_PUSH_DISABLE_WARNING(4251 4800, "-Wunknown-warning-option") // disable warnings spawned by QT #include @@ -29,4 +29,4 @@ namespace ShaderManagementConsole } } // namespace ShaderManagementConsole -#include +#include