From 6a6be193c712c4eb8a53f257648c9ccdc584fdbe Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Wed, 14 Jul 2021 09:36:30 -0700 Subject: [PATCH] Code/Editor Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Editor/Include/IEditorClassFactory.h | 12 +----------- Code/Editor/Include/IIconManager.h | 2 ++ Code/Editor/Include/IObjectManager.h | 6 ++++++ Code/Editor/MainWindow.h | 1 + Code/Editor/Objects/DisplayContextShared.inl | 1 + Code/Editor/Objects/SelectionGroup.h | 2 ++ Code/Editor/RenderHelpers/AxisHelper.h | 2 ++ Code/Editor/Util/Math.h | 1 + Code/Editor/WipFeatureManager.cpp | 2 +- Code/Editor/WipFeatureManager.h | 9 ++++++--- 10 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Code/Editor/Include/IEditorClassFactory.h b/Code/Editor/Include/IEditorClassFactory.h index bbd0979b72..c406ca1fdd 100644 --- a/Code/Editor/Include/IEditorClassFactory.h +++ b/Code/Editor/Include/IEditorClassFactory.h @@ -14,6 +14,7 @@ #pragma once #include +#include #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 } }; } @@ -68,7 +69,6 @@ enum #include "SandboxAPI.h" class QObject; -class QString; //! System class IDs @@ -120,19 +120,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; } diff --git a/Code/Editor/Include/IIconManager.h b/Code/Editor/Include/IIconManager.h index 3248a2c67e..96d018e7dc 100644 --- a/Code/Editor/Include/IIconManager.h +++ b/Code/Editor/Include/IIconManager.h @@ -14,6 +14,8 @@ struct IStatObj; struct IMaterial; class CBitmap; +class QImage; + // Note: values are used as array indices enum EStatObject { diff --git a/Code/Editor/Include/IObjectManager.h b/Code/Editor/Include/IObjectManager.h index 7d4856bd33..802c6d5350 100644 --- a/Code/Editor/Include/IObjectManager.h +++ b/Code/Editor/Include/IObjectManager.h @@ -10,6 +10,10 @@ #define CRYINCLUDE_EDITOR_INCLUDE_IOBJECTMANAGER_H #pragma once +#include +#include +#include + // forward declarations. class CEntityObject; struct DisplayContext; @@ -23,6 +27,8 @@ class CViewport; struct HitContext; enum class ImageRotationDegrees; struct IStatObj; +class CBaseObject; +class XmlNodeRef; #include "ObjectEvent.h" diff --git a/Code/Editor/MainWindow.h b/Code/Editor/MainWindow.h index 99af2ea326..0f94a0ed18 100644 --- a/Code/Editor/MainWindow.h +++ b/Code/Editor/MainWindow.h @@ -10,6 +10,7 @@ #if !defined(Q_MOC_RUN) #include #include +#include #include #include diff --git a/Code/Editor/Objects/DisplayContextShared.inl b/Code/Editor/Objects/DisplayContextShared.inl index e122f68be7..ad5dad6ce0 100644 --- a/Code/Editor/Objects/DisplayContextShared.inl +++ b/Code/Editor/Objects/DisplayContextShared.inl @@ -12,6 +12,7 @@ #include "IEditor.h" #include "Include/IIconManager.h" #include "Include/IDisplayViewport.h" +#include #include #include diff --git a/Code/Editor/Objects/SelectionGroup.h b/Code/Editor/Objects/SelectionGroup.h index 818a49b84c..b570eef4fb 100644 --- a/Code/Editor/Objects/SelectionGroup.h +++ b/Code/Editor/Objects/SelectionGroup.h @@ -19,6 +19,8 @@ class CBaseObject; #include "ObjectEvent.h" #include "Objects/BaseObject.h" +#include + /*! * CSelectionGroup is a named selection group of objects. */ diff --git a/Code/Editor/RenderHelpers/AxisHelper.h b/Code/Editor/RenderHelpers/AxisHelper.h index 5d07cb246e..94ea8da296 100644 --- a/Code/Editor/RenderHelpers/AxisHelper.h +++ b/Code/Editor/RenderHelpers/AxisHelper.h @@ -16,6 +16,8 @@ struct DisplayContext; struct HitContext; struct IDisplayViewport; +class QPoint; + ////////////////////////////////////////////////////////////////////////// struct SGizmoParameters { diff --git a/Code/Editor/Util/Math.h b/Code/Editor/Util/Math.h index 4f900b80ed..21e9e37846 100644 --- a/Code/Editor/Util/Math.h +++ b/Code/Editor/Util/Math.h @@ -12,6 +12,7 @@ #define CRYINCLUDE_EDITOR_UTIL_MATH_H #pragma once +#include //! Half PI #define PI_HALF (3.1415926535897932384626433832795f / 2.0f) diff --git a/Code/Editor/WipFeatureManager.cpp b/Code/Editor/WipFeatureManager.cpp index 9cd737c258..1bc89be769 100644 --- a/Code/Editor/WipFeatureManager.cpp +++ b/Code/Editor/WipFeatureManager.cpp @@ -445,7 +445,7 @@ void CWipFeatureManager::SetFeatureUpdateCallback(int aFeatureId, TWipFeatureUpd m_features[aFeatureId].m_pfnUpdateFeature = pfnUpdate; } -std::map& CWipFeatureManager::GetFeatures() +AZStd::map& CWipFeatureManager::GetFeatures() { return m_features; } diff --git a/Code/Editor/WipFeatureManager.h b/Code/Editor/WipFeatureManager.h index b6e43dcd88..7b18773307 100644 --- a/Code/Editor/WipFeatureManager.h +++ b/Code/Editor/WipFeatureManager.h @@ -10,6 +10,9 @@ #define CRYINCLUDE_EDITOR_WIPFEATUREMANAGER_H #pragma once +#include +#include + /* This class is used to control work in progress features at runtime, so QA can test even if the end user will not see those features You can use the console command: e_wipfeature enable|disable|hide|show|safemode|fullmode @@ -72,14 +75,14 @@ public: {} int m_id; - string m_displayName, m_params; + AZStd::string m_displayName, m_params; bool m_bVisible, m_bEnabled, m_bSafeMode, // if true, this feature will be saved into the xml file when Save(...) will be called m_bSaveToXml, m_bLoadedFromXml; TWipFeatureUpdateCallback m_pfnUpdateFeature; }; - typedef std::map TWipFeatures; + typedef AZStd::map TWipFeatures; private: @@ -95,7 +98,7 @@ public: if (!s_pInstance) { s_pInstance = new CWipFeatureManager(); - assert(s_pInstance); + AZ_Assert(s_pInstance, "Could not construct CWipFeatureManager"); } return s_pInstance;