Merge branch 'development' of https://github.com/o3de/o3de into MultiplayerWeapons

2021-07-20 14:13:24 -07:00
parent 07a1af99ba 92571c2ae4
commit 52780f2130
2202 changed files with 18110 additions and 156389 deletions
@@ -54,10 +54,9 @@ private:

    AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
    static XmlNodeRef m_node;
-    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
    static QString m_title;
-
    static QVariant s_pendingPut;
+    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING

    QWidget* m_parent;
    QTimer m_putDebounce;
@@ -16,6 +16,7 @@
 #include <AzToolsFramework/Entity/SliceEditorEntityOwnershipServiceBus.h>
 #include <AzCore/Component/Component.h>
 #include <TimeValue.h>
+#include <IEditor.h>
 #endif

 class CClouds;
@@ -15,6 +15,7 @@
 #pragma once

 #include <vector>
+#include <QtCore/QString>

 #define DEFINE_UUID(l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
 static const GUID uuid() { return { l, w1, w2, { b1, b2,  b3,  b4,  b5,  b6,  b7,  b8 } }; }
@@ -69,7 +70,6 @@ enum
 #include "SandboxAPI.h"

 class QObject;
-class QString;


 //! System class IDs
@@ -121,19 +121,9 @@ struct IClassDesc
    //! create panel.
    virtual QString Category() = 0;

-#ifdef QSTRING_H
    virtual QString MenuSuggestion() { return QString(); }
    virtual QString Tooltip() { return QString(); }
    virtual QString Description() { return QString(); }
-#else
-    //! This method returns the desired menu in which this plugin class would like to be placed in the editor.
-    //! It is up to the editor to determine if it can and wants to fulfill this request.
-    virtual QString MenuSuggestion();
-    //! This method returns the tooltip for the pane
-    virtual QString Tooltip();
-    //! This method returns the description for the pane
-    virtual QString Description();
-#endif

    //! This method returns if the plugin should have a menu item for its pane.
    virtual bool ShowInMenu() const { return true; }
@@ -15,6 +15,8 @@ struct IStatObj;
 struct IMaterial;
 class CBitmap;

+class QImage;
+
 // Note: values are used as array indices
 enum EStatObject
 {
@@ -11,6 +11,10 @@
 #define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H
 #pragma once

+#include <AzCore/PlatformIncl.h>
+#include <CryCommon/platform.h>
+#include <CryCommon/Cry_Geo.h>
+
 // forward declarations.
 class CEntityObject;
 struct DisplayContext;
@@ -24,6 +28,8 @@ class CViewport;
 struct HitContext;
 enum class ImageRotationDegrees;
 struct IStatObj;
+class CBaseObject;
+class XmlNodeRef;

 #include "ObjectEvent.h"

@@ -11,6 +11,7 @@
 #if !defined(Q_MOC_RUN)
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/Component/Component.h>
+#include <AzCore/EBus/Event.h>

 #include <QComboBox>
 #include <QMainWindow>
@@ -31,6 +31,7 @@ struct IRenderAuxGeom;
 struct IIconManager;
 class CDisplaySettings;
 class CCamera;
+class QPoint;

 enum DisplayFlags
 {
@@ -13,6 +13,7 @@
 #include "IEditor.h"
 #include "Include/IIconManager.h"
 #include "Include/IDisplayViewport.h"
+#include <Editor/Util/EditorUtils.h>

 #include <QDateTime>
 #include <QPoint>
@@ -20,6 +20,8 @@ class CBaseObject;
 #include "ObjectEvent.h"
 #include "Objects/BaseObject.h"

+#include <Editor/EditorDefs.h>
+
 /*!
 *  CSelectionGroup is a named selection group of objects.
 */
@@ -6,7 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
 #include "ComponentEntityEditorPlugin.h"

 #include <LyViewPaneNames.h>
@@ -1,33 +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 <AzCore/PlatformDef.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// Engine
-/////////////////////////////////////////////////////////////////////////////
-#include <Cry_Math.h>
-#include <ISystem.h>
-#include <ISerialize.h>
-#include <CryName.h>
-#include <EditorDefs.h>
-#include <Resource.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// STL
-/////////////////////////////////////////////////////////////////////////////
-#include <vector>
-#include <list>
-#include <map>
-#include <set>
-#include <algorithm>
-
-#ifdef CreateDirectory
-#undef CreateDirectory
-#endif
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "ComponentEntityObject.h"


@@ -5,8 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "SandboxIntegration.h"

 #include <AzCore/Component/ComponentApplicationBus.h>
@@ -83,6 +81,7 @@
 #include <Editor/StringDlg.h>
 #include <Editor/QtViewPaneManager.h>
 #include <Editor/EditorViewportSettings.h>
+#include <Editor/Util/PathUtil.h>
 #include <IResourceSelectorHost.h>
 #include "CryEdit.h"

@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include <AzCore/Component/TransformBus.h>
 #include <AzCore/UnitTest/TestTypes.h>
 #include <AzTest/AzTest.h>
@@ -6,15 +6,11 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include <AzTest/AzTest.h>
 #include <AzCore/Memory/SystemAllocator.h>

 #include <QApplication>

-using namespace AZ;
-
 // Handle asserts
 class ToolsFrameworkHook
    : public AZ::Test::ITestEnvironment
@@ -22,12 +18,12 @@ class ToolsFrameworkHook
 public:
    void SetupEnvironment() override
    {
-        AllocatorInstance<SystemAllocator>::Create();
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Create();
    }

    void TeardownEnvironment() override
    {
-        AllocatorInstance<SystemAllocator>::Destroy();
+        AZ::AllocatorInstance<AZ::SystemAllocator>::Destroy();
    }
 };

@@ -6,8 +6,7 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
+#include <EditorDefs.h>
 #include "CryEdit.h"
 #include "AssetCatalogModel.h"
 #include "Objects/ComponentEntityObject.h"
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "CategoriesList.h"

 ComponentCategoryList::ComponentCategoryList(QWidget* parent /*= nullptr*/) 
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "ComponentDataModel.h"

 #include "Include/IObjectManager.h"
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "ComponentPaletteWindow.h"
 #include "ComponentDataModel.h"
 #include "FavoriteComponentList.h"
@@ -27,6 +25,7 @@
 #include <AzToolsFramework/API/ViewPaneOptions.h>

 #include <QLabel>
+#include <QKeyEvent>

 ComponentPaletteWindow::ComponentPaletteWindow(QWidget* parent)
    : QMainWindow(parent)
@@ -9,7 +9,9 @@
 #pragma once

 #if !defined(Q_MOC_RUN)
+#include <AzCore/PlatformIncl.h>
 #include <QMainWindow>
+#include <AzCore/Math/Guid.h>
 #endif

 namespace AzToolsFramework
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "FavoriteComponentList.h"
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "ComponentDataModel.h"
 #include "FavoriteComponentList.h"
 #include "FilteredComponentList.h"
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "InformationPanel.h"

 // TODO: LMBR-28174
@@ -5,8 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "OutlinerDisplayOptionsMenu.h"

 #include <QIcon>
@@ -5,8 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "OutlinerListModel.hxx"

 #include <QtCore/QMimeData>
@@ -65,6 +63,7 @@

 #include <Editor/CryEditDoc.h>
 #include <AzCore/Outcome/Outcome.h>
+#include <Editor/Util/PathUtil.h>

 ////////////////////////////////////////////////////////////////////////////
 // OutlinerListModel
@@ -5,10 +5,9 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "OutlinerSearchWidget.h"

+#include <AzCore/Casting/numeric_cast.h>
 #include <AzQtComponents/Components/FlowLayout.h>
 #include <AzQtComponents/Components/StyleManager.h>
 #include <QLabel>
@@ -16,6 +15,7 @@
 #include <QTextDocument>
 #include <QPainter>
 #include <QToolButton>
+#include <QApplication>

 namespace AzQtComponents
 {
@@ -19,6 +19,7 @@
 #if !defined(DEFINED_QMETATYPE_UUID)
 #define DEFINED_QMETATYPE_UUID

+#include <AzCore/Math/Uuid.h>
 Q_DECLARE_METATYPE(AZ::Uuid);
 #endif

@@ -5,8 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "OutlinerSortFilterProxyModel.hxx"

 #include <AzCore/Component/ComponentApplication.h>
@@ -5,8 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "OutlinerTreeView.hxx"
 #include "OutlinerListModel.hxx"

@@ -19,6 +17,7 @@
 #include <QDrag>
 #include <QPainter>
 #include <QHeaderView>
+#include <QMouseEvent>

 OutlinerTreeView::OutlinerTreeView(QWidget* pParent)
    : QTreeView(pParent)
@@ -5,8 +5,8 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ComponentEntityEditorPlugin_precompiled.h"

+#include <CryCommon/platform.h>
 #include "MainWindow.h"                     // for MainWindow

 #include "OutlinerListModel.hxx"
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "UI/QComponentEntityEditorMainWindow.h"

 #include <AzCore/Component/Entity.h>
@@ -11,6 +11,8 @@
 #include <QMainWindow>

 #include <AzCore/Serialization/SerializeContext.h>
+
+#include <CryCommon/ISystem.h>
 #endif

 class QObjectPropertyModel;
@@ -6,8 +6,7 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
+#include <EditorDefs.h>
 #include "CryEdit.h"
 #include "UI/QComponentEntityEditorOutlinerWindow.h"
 #include "UI/Outliner/OutlinerWidget.hxx"
@@ -6,8 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
 #include "UI/QComponentLevelEntityEditorMainWindow.h"

 #include <AzCore/Component/Entity.h>
@@ -12,7 +12,6 @@ set(FILES
    ComponentEntityEditorPlugin.cpp
    SandboxIntegration.h
    SandboxIntegration.cpp
-    ComponentEntityEditorPlugin_precompiled.h
    UI/QComponentEntityEditorMainWindow.h
    UI/QComponentEntityEditorMainWindow.cpp
    UI/QComponentLevelEntityEditorMainWindow.h
@@ -6,15 +6,6 @@
 *
 */

-#include "ComponentEntityEditorPlugin_precompiled.h"
-
-// All plugins suffer from the following warning:
-//  warning C4273: 'GetIEditor' : inconsistent dll linkage
-// GetIEditor() is forward-declared using EDITOR_CORE_API, which without EDITOR_CORE set,
-// results in dllimport rather than dllexport. This define ensure it's consistently and
-// properly defined for export.
-#define EDITOR_CORE
-
 #include <platform.h>

 #include <IEditor.h>
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorAssetImporter_precompiled.h"
 #include <AssetBrowserContextProvider.h>
 #include <AssetImporterPlugin.h>
 #include <QtCore/QMimeData>
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorAssetImporter_precompiled.h"
 #include <AssetImporterDocument.h>
 #include <AzToolsFramework/Debug/TraceContext.h>
 #include <SceneAPI/SceneCore/Export/MtlMaterialExporter.h>
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorAssetImporter_precompiled.h"
 #include <AssetImporterPlugin.h>
 #include <AssetImporterWindow.h>
 #include <QtViewPaneManager.h>
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorAssetImporter_precompiled.h"
 #include <AssetImporterWindow.h>
 #include <ui_AssetImporterWindow.h>
 #include <AssetImporterPlugin.h>
@@ -15,10 +15,12 @@
 /////////////////////////////////////////////////////////////////////////////

 #if !defined(Q_MOC_RUN)
+#include <AzCore/PlatformIncl.h>
 #include <QMainWindow>
 #include <AssetImporterDocument.h>
 #include <AzCore/std/smart_ptr/shared_ptr.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
+#include <AzCore/Math/Guid.h>
 #endif

 namespace AZStd
@@ -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 <AzCore/PlatformDef.h>
-
-#include <platform.h>
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorAssetImporter_precompiled.h"
 #include <ImporterRootDisplay.h>
 #include <ui_ImporterRootDisplay.h>

@@ -12,14 +12,10 @@
 //
 /////////////////////////////////////////////////////////////////////////////

-#include "EditorAssetImporter_precompiled.h"
 #include "AssetImporterPlugin.h"


-#if defined(AZ_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
+#include <AzCore/PlatformIncl.h>
 #include <AzCore/Memory/SystemAllocator.h>

 PLUGIN_API IPlugin* CreatePluginInstance(PLUGIN_INIT_PARAM* pInitParam)
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorAssetImporter_precompiled.h"
 #include <AzCore/IO/SystemFile.h>
 #include <AzCore/std/algorithm.h>
 #include <AzCore/std/string/conversions.h>
@@ -20,7 +20,6 @@ set(FILES
    SceneSerializationHandler.h
    SceneSerializationHandler.cpp
    Main.cpp
-    EditorAssetImporter_precompiled.h
    AssetImporter.qrc
    AssetImporterWindow.ui
    ImporterRootDisplay.ui
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorCommon_precompiled.h"
 #include <ActionOutput.h>
 #include <QWidget>

@@ -7,5 +7,4 @@
 */


-#include "EditorCommon_precompiled.h"
 #include "../../Editor/RenderHelpers/AxisHelperShared.inl"
@@ -6,6 +6,4 @@
 *
 */

-
-#include "EditorCommon_precompiled.h"
 #include "../../Editor/Objects/DisplayContextShared.inl"
@@ -7,7 +7,6 @@
 */


-#include "EditorCommon_precompiled.h"
 #include "Ruler.h"

 #include <QPainter>
@@ -44,7 +43,7 @@ namespace DrawingPrimitives
        const float ticksMinPower = log10f(RULER_MIN_PIXELS_PER_TICK);
        const float ticksPowerDelta = ticksMinPower - log10f(pixelsPerUnit);

-        const int digitsAfterPoint = max(-int(ceil(ticksPowerDelta)) - 1, 0);
+        const int digitsAfterPoint = AZStd::max(-int(ceil(ticksPowerDelta)) - 1, 0);
        if (pRulerPrecision)
        {
            *pRulerPrecision = digitsAfterPoint;
@@ -160,7 +159,7 @@ namespace DrawingPrimitives


        char format[16] = "";
-        sprintf_s(format, "%%.%df", rulerPrecision);
+        azsprintf(format, "%%.%df", rulerPrecision);

        const int height = options.m_rect.height();
        const int top = options.m_rect.top();
@@ -7,7 +7,6 @@
 */


-#include "EditorCommon_precompiled.h"
 #include "TimeSlider.h"

 #include <QPainter>
@@ -5,13 +5,14 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "EditorCommon_precompiled.h"

 #include <platform.h>
 #include "EditorCommon.h"

 #include "EditorCommonAPI.h"

+#include <CryCommon/ISystem.h>
+
 CEditorCommonApp::CEditorCommonApp()
 {
 }
@@ -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
-
-#ifndef VC_EXTRALEAN
-#define VC_EXTRALEAN
-#endif
-
-// These redicilous dependencies are needed just to be able to use
-// Sandbox gizmos drawing and hit-testing code =(
-
-#include "ISystem.h"
-#include "Include/EditorCoreAPI.h"
-#include "Util/EditorUtils.h"
-
@@ -7,7 +7,6 @@
 */


-#include "EditorCommon_precompiled.h"
 #include "platform.h"

 #pragma warning(disable: 4266) // disabled warning from afk overrides
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorCommon_precompiled.h"
 #include <SaveUtilities/AsyncSaveRunner.h>
 #include <AzToolsFramework/SourceControl/SourceControlAPI.h>
 #include <AzCore/IO/SystemFile.h>
@@ -6,7 +6,6 @@
 *
 */

-#include "EditorCommon_precompiled.h"
 #include <WinWidget/WinWidgetManager.h>

 namespace WinWidget
@@ -14,6 +14,8 @@
 #include <vector>
 #include <functional>

+class QWidget;
+
 namespace WinWidget
 {
    class EDITOR_COMMON_API WinWidgetManager
@@ -11,7 +11,6 @@ set(FILES
    EditorCommon.cpp
    EditorCommon.rc
    EditorCommonAPI.h
-    EditorCommon_precompiled.h
    ActionOutput.h
    ActionOutput.cpp
    UiEditorDLLBus.h
@@ -1,14 +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
- *
- */
-
-
-// stdafx.cpp : source file that includes just the standard includes
-// EditorCommon.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "EditorCommon_precompiled.h"
@@ -7,7 +7,6 @@
 */


-#include "FFMPEGPlugin_precompiled.h"
 #include "FFMPEGPlugin.h"
 #include "CryString.h"
 typedef CryStringT<char> string;
@@ -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 <AzCore/PlatformDef.h>
-
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <platform.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <ISystem.h>
-#include "EditorCoreAPI.h"
@@ -9,7 +9,6 @@
 set(FILES
    FFMPEGPlugin.rc
    main.cpp
-    FFMPEGPlugin_precompiled.h
    FFMPEGPlugin.cpp
    FFMPEGPlugin.h
 )
@@ -6,8 +6,6 @@
 *
 */

-
-#include "FFMPEGPlugin_precompiled.h"
 #include "FFMPEGPlugin.h"
 #include "Include/IEditorClassFactory.h"

@@ -6,8 +6,6 @@
 *
 */

-
-#include "PerforcePlugin_precompiled.h"
 #include "PerforcePlugin.h"
 #include "PasswordDlg.h"
 #include <ui_settings.h> // generated
@@ -6,8 +6,6 @@
 *
 */

-
-#include "PerforcePlugin_precompiled.h"
 #include "PerforcePlugin.h"
 #include "PerforceSourceControl.h"
 #include "Include/ISourceControl.h"
@@ -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
- *
- */
-
-#pragma once
-
-#include <AzCore/PlatformDef.h>
-
-#include "resource.h"
-
-/////////////////////////////////////////////////////////////////////////////
-// CRY Stuff ////////////////////////////////////////////////////////////////
-/////////////////////////////////////////////////////////////////////////////
-#include <platform.h>
-#include "Util/EditorUtils.h"
@@ -6,8 +6,6 @@
 *
 */

-
-#include "PerforcePlugin_precompiled.h"
 #include "CryFile.h"
 #include "PerforceSourceControl.h"
 #include "PasswordDlg.h"
@@ -14,6 +14,7 @@

 #include "Include/ISourceControl.h"

+#include <QtCore/QString>

 class CPerforceSourceControl
    : public ISourceControl
@@ -6,9 +6,6 @@
 *
 */

-
-#include "PerforcePlugin_precompiled.h"
-
 #include "PerforcePlugin.h"

 #include "Include/ISourceControl.h"
@@ -17,5 +17,4 @@ set(FILES
    PerforceSourceControl.cpp
    PerforceSourceControl.h
    resource.h
-    PerforcePlugin_precompiled.h
 )
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "DefaultImageValidator.h"

 #include "PropertyImagePreview.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "FunctorValidator.h"

 namespace ProjectSettingsTool
@@ -10,6 +10,7 @@

 #include <AzCore/EBus/EBus.h>

+#include <QtCore/QString>

 namespace ProjectSettingsTool
 {
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PlatformSettings_Android.h"

 #include "PlatformSettings_common.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PlatformSettings_Base.h"

 #include "PlatformSettings_common.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PlatformSettings_Ios.h"

 #include "PlatformSettings_common.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PlistDictionary.h"


@@ -6,13 +6,13 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "ProjectSettingsContainer.h"

 #include <AzCore/JSON/prettywriter.h>
 #include <AzCore/JSON/stringbuffer.h>
 #include <AzCore/XML/rapidxml_print.h>

+#include <CryCommon/platform.h>
 #include <Util/FileUtil.h>

 namespace ProjectSettingsTool
@@ -15,6 +15,8 @@
 #include <AzCore/Outcome/Outcome.h>
 #include <AzCore/std/smart_ptr/unique_ptr.h>
 #include <AzCore/std/string/string.h>
+#include <AzCore/std/containers/queue.h>
+#include <AzCore/std/containers/unordered_map.h>

 #include <AzFramework/StringFunc/StringFunc.h>

@@ -6,7 +6,7 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
+#include <EditorDefs.h>
 #include "ProjectSettingsSerialization.h"

 #include "PlatformSettings_common.h"
@@ -6,7 +6,7 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
+#include <EditorDefs.h>
 #include "ProjectSettingsToolWindow.h"
 #include "ui_ProjectSettingsToolWidget.h"

@@ -1,17 +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 <AzCore/PlatformDef.h>
-
-/////////////////////////////////////////////////////////////////////////////
-// Engine
-/////////////////////////////////////////////////////////////////////////////
-#include <ISystem.h>
-#include <Cry_Math.h>
-
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "ProjectSettingsValidator.h"

 #include "Validators.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyFileSelect.h"

 #include "PlatformSettings_common.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyFuncValBrowseEdit.h"
 #include "PlatformSettings_common.h"
 #include "ValidationHandler.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyFuncValLineEdit.h"

 #include "PlatformSettings_common.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyImagePreview.h"

 #include "DefaultImageValidator.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "PropertyLinked.h"

 #include "PlatformSettings_common.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "Utils.h"
 #include "LastPathBus.h"

@@ -6,8 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
-
 #include "ValidationHandler.h"

 #include "PropertyFuncValLineEdit.h"
@@ -6,7 +6,6 @@
 *
 */

-#include "ProjectSettingsTool_precompiled.h"
 #include "Validators.h"

 #include <QDir>
@@ -5,7 +5,6 @@
 * SPDX-License-Identifier: Apache-2.0 OR MIT
 *
 */
-#include "ProjectSettingsTool_precompiled.h"

 #include <AzToolsFramework/API/ToolsApplicationAPI.h>
 #include <AzToolsFramework/API/ViewPaneOptions.h>
@@ -8,7 +8,6 @@

 set(FILES
    main.cpp
-    ProjectSettingsTool_precompiled.h
    DefaultImageValidator.cpp
    DefaultImageValidator.h
    FunctorValidator.cpp
@@ -8,10 +8,6 @@

 #pragma once

-#if !defined(Q_MOC_RUN)
-#include "Include/EditorCoreAPI.h"
-#endif
-
 #if !defined(Q_MOC_RUN)
 #include "Include/EditorCoreAPI.h"
 #include <QtViewPane.h>
@@ -17,6 +17,8 @@ struct DisplayContext;
 struct HitContext;
 struct IDisplayViewport;

+class QPoint;
+
 //////////////////////////////////////////////////////////////////////////
 struct SGizmoParameters
 {
@@ -14,6 +14,7 @@

 #include <QInputDialog>
 #include <QMessageBox>
+#include <SandboxAPI.h>

 /////////////////////////////////////////////////////////////////////////////
 // StringDlg Qt dialog
@@ -14,7 +14,7 @@
 #define CRYINCLUDE_EDITOR_UTIL_EDITORUTILS_H
 #pragma once

-
+#include <CryCommon/platform.h>
 #include <IXml.h>
 #include "Util/FileUtil.h"
 #include <Cry_Color.h>
@@ -13,6 +13,7 @@
 #define CRYINCLUDE_EDITOR_UTIL_MATH_H
 #pragma once

+#include <Editor/Util/EditorUtils.h>

 //! Half PI
 #define PI_HALF (3.1415926535897932384626433832795f / 2.0f)
@@ -15,6 +15,7 @@
 #pragma once

 #include <Include/EditorCoreAPI.h>
+#include <CryCommon/ISystem.h>

 //! Derive from this class to get reference counting in your class.
 class EDITOR_CORE_API CRefCountBase
@@ -15,11 +15,7 @@
 #include <cctype>
 #include <algorithm>

-#if defined(AZ_PLATFORM_WINDOWS)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>   // WideCharToMultibyte(), CP_UTF8, etc.
-#endif
-
+#include <AzCore/PlatformIncl.h> // WideCharToMultibyte(), CP_UTF8, etc.
 #include <AzCore/Casting/numeric_cast.h>

 static inline char ToLower(const char c)
--- a/Show More
+++ b/Show More