From 7d71e3dc07d7515630cc3d62aa30847de09f4995 Mon Sep 17 00:00:00 2001 From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> Date: Mon, 23 Aug 2021 13:00:27 -0700 Subject: [PATCH] Code/Editor Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com> --- Code/Editor/Controls/ImageHistogramCtrl.cpp | 6 ------ Code/Editor/Controls/TimelineCtrl.cpp | 5 ----- Code/Editor/FBXExporterDialog.cpp | 6 ------ Code/Editor/IconManager.cpp | 13 ------------ Code/Editor/LevelFileDialog.cpp | 16 -------------- Code/Editor/MainWindow.cpp | 6 ------ .../Objects/ComponentEntityObject.cpp | 5 ----- Code/Editor/ToolsConfigPage.cpp | 2 -- Code/Editor/TopRendererWnd.cpp | 21 ------------------- .../TrackView/TVCustomizeTrackColorsDlg.cpp | 1 - Code/Editor/TrackView/TVEventsDialog.cpp | 6 ------ Code/Editor/TrackView/TrackViewDialog.cpp | 3 --- 12 files changed, 90 deletions(-) diff --git a/Code/Editor/Controls/ImageHistogramCtrl.cpp b/Code/Editor/Controls/ImageHistogramCtrl.cpp index 252bf4f09b..48bc7a70d2 100644 --- a/Code/Editor/Controls/ImageHistogramCtrl.cpp +++ b/Code/Editor/Controls/ImageHistogramCtrl.cpp @@ -30,12 +30,6 @@ namespace ImageHistogram const QColor kGreenSectionColor = QColor(220, 255, 220); const QColor kBlueSectionColor = QColor(220, 220, 255); const QColor kSplitSeparatorColor = QColor(100, 100, 0); - const QColor kButtonBackColor = QColor(20, 20, 20); - const QColor kBtnLightColor(200, 200, 200); - const QColor kBtnShadowColor(50, 50, 50); - const int kButtonWidth = 40; - const QColor kButtonTextColor(255, 255, 0); - const int kTextLeftSpacing = 4; const int kTextFontSize = 70; const char* kTextFontFace = "Arial"; const QColor kTextColor(255, 255, 255); diff --git a/Code/Editor/Controls/TimelineCtrl.cpp b/Code/Editor/Controls/TimelineCtrl.cpp index 8159084784..aa30c326ac 100644 --- a/Code/Editor/Controls/TimelineCtrl.cpp +++ b/Code/Editor/Controls/TimelineCtrl.cpp @@ -18,11 +18,6 @@ #include "ScopedVariableSetter.h" #include "GridUtils.h" - -static const QColor timeMarkerCol = QColor(255, 0, 255); -static const QColor textCol = QColor(0, 0, 0); -static const QColor ltgrayCol = QColor(110, 110, 110); - QColor InterpolateColor(const QColor& c1, const QColor& c2, float fraction) { const int r = static_cast(static_cast(c2.red() - c1.red()) * fraction + c1.red()); diff --git a/Code/Editor/FBXExporterDialog.cpp b/Code/Editor/FBXExporterDialog.cpp index bae4b9bf7e..b080362b97 100644 --- a/Code/Editor/FBXExporterDialog.cpp +++ b/Code/Editor/FBXExporterDialog.cpp @@ -17,12 +17,6 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING #include AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING - -namespace -{ - const uint kDefaultFPS = 30u; -} - CFBXExporterDialog::CFBXExporterDialog(bool bDisplayOnlyFPSSetting, QWidget* pParent) : QDialog(pParent) , m_ui(new Ui::FBXExporterDialog) diff --git a/Code/Editor/IconManager.cpp b/Code/Editor/IconManager.cpp index dc9eb56b88..7732ae8155 100644 --- a/Code/Editor/IconManager.cpp +++ b/Code/Editor/IconManager.cpp @@ -27,19 +27,6 @@ namespace { - // Object names in this array must correspond to EObject enumeration. - const char* g_ObjectNames[eStatObject_COUNT] = - { - "Objects/Arrow.cgf", - "Objects/Axis.cgf", - "Objects/Sphere.cgf", - "Objects/Anchor.cgf", - "Objects/entrypoint.cgf", - "Objects/hidepoint.cgf", - "Objects/hidepoint_sec.cgf", - "Objects/reinforcement_point.cgf", - }; - const char* g_IconNames[eIcon_COUNT] = { "Icons/ScaleWarning.png", diff --git a/Code/Editor/LevelFileDialog.cpp b/Code/Editor/LevelFileDialog.cpp index c0c2b96c59..3f3077a2c4 100644 --- a/Code/Editor/LevelFileDialog.cpp +++ b/Code/Editor/LevelFileDialog.cpp @@ -32,22 +32,6 @@ static const char lastLoadPathFilename[] = "lastLoadPath.preset"; // Folder in which levels are stored static const char kLevelsFolder[] = "Levels"; -// List of folder names that are used to detect a level folder -static const char* kLevelFolderNames[] = -{ - "Layers", - "Minimap", - "LevelData" -}; - -// List of files that are used to detect a level folder -static const char* kLevelFileNames[] = -{ - "level.pak", - "filelist.xml", - "levelshadercache.pak", -}; - CLevelFileDialog::CLevelFileDialog(bool openDialog, QWidget* parent) : QDialog(parent) , m_bOpenDialog(openDialog) diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp index fa2e792cc8..bec61df984 100644 --- a/Code/Editor/MainWindow.cpp +++ b/Code/Editor/MainWindow.cpp @@ -108,12 +108,6 @@ using namespace AzToolsFramework; #define LAYOUTS_WILDCARD "*.layout" #define DUMMY_LAYOUT_NAME "Dummy_Layout" -static const char* g_openViewPaneEventName = "OpenViewPaneEvent"; //Sent when users open view panes; -static const char* g_viewPaneAttributeName = "ViewPaneName"; //Name of the current view pane -static const char* g_openLocationAttributeName = "OpenLocation"; //Indicates where the current view pane is opened from - -static const char* g_assetImporterName = "AssetImporter"; - class CEditorOpenViewCommand : public _i_reference_target_t { diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp index c91bf58074..36bdcf3a73 100644 --- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp +++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/Objects/ComponentEntityObject.cpp @@ -49,11 +49,6 @@ * Scalars for icon drawing behavior. */ static const int s_kIconSize = 36; /// Icon display size (in pixels) -static const float s_kIconMaxWorldDist = 200.f; /// Icons are culled past this range -static const float s_kIconMinScale = 0.1f; /// Minimum scale for icons in the distance -static const float s_kIconMaxScale = 1.0f; /// Maximum scale for icons near the camera -static const float s_kIconCloseDist = 3.f; /// Distance at which icons are at maximum scale -static const float s_kIconFarDist = 40.f; /// Distance at which icons are at minimum scale CComponentEntityObject::CComponentEntityObject() : m_hasIcon(false) diff --git a/Code/Editor/ToolsConfigPage.cpp b/Code/Editor/ToolsConfigPage.cpp index 1871dc763f..50001dc2f0 100644 --- a/Code/Editor/ToolsConfigPage.cpp +++ b/Code/Editor/ToolsConfigPage.cpp @@ -39,8 +39,6 @@ namespace QColor COLOR_FOR_CONSOLE_COMMAND = QColor(0, 0, 255); QColor COLOR_FOR_TOGGLE_COMMAND = QColor(128, 0, 255); QColor COLOR_FOR_INVALID_COMMAND = QColor(255, 0, 0); - - UINT CONSOLE_CMD_DROP_LIST_HEIGHT = 300; }; class IconListModel diff --git a/Code/Editor/TopRendererWnd.cpp b/Code/Editor/TopRendererWnd.cpp index 7bbefdd63f..3159301267 100644 --- a/Code/Editor/TopRendererWnd.cpp +++ b/Code/Editor/TopRendererWnd.cpp @@ -26,27 +26,6 @@ #define GL_RGBA 0x1908 #define GL_BGRA 0x80E1 -// Used to give each static object type a different color -static uint32 sVegetationColors[16] = -{ - 0xFFFF0000, - 0xFF00FF00, - 0xFF0000FF, - 0xFFFFFFFF, - 0xFFFF00FF, - 0xFFFFFF00, - 0xFF00FFFF, - 0xFF7F00FF, - 0xFF7FFF7F, - 0xFFFF7F00, - 0xFF00FF7F, - 0xFF7F7F7F, - 0xFFFF0000, - 0xFF00FF00, - 0xFF0000FF, - 0xFFFFFFFF, -}; - ////////////////////////////////////////////////////////////////////// // Construction/Destruction ////////////////////////////////////////////////////////////////////// diff --git a/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp index ae1080a9c1..b30f655b0b 100644 --- a/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp +++ b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp @@ -106,7 +106,6 @@ namespace { AnimParamType::User, "Muted", QColor(255, 224, 224) }, }; - const int kButtonsIdBase = 0x7fff; const int kMaxRows = 20; const int kColumnWidth = 300; const int kRowHeight = 24; diff --git a/Code/Editor/TrackView/TVEventsDialog.cpp b/Code/Editor/TrackView/TVEventsDialog.cpp index 86b4c1f6bc..dbaaf4b530 100644 --- a/Code/Editor/TrackView/TVEventsDialog.cpp +++ b/Code/Editor/TrackView/TVEventsDialog.cpp @@ -29,12 +29,6 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING // CTVEventsDialog dialog -namespace -{ - const int kCountSubItemIndex = 1; - const int kTimeSubItemIndex = 2; -} - class TVEventsModel : public QAbstractTableModel { diff --git a/Code/Editor/TrackView/TrackViewDialog.cpp b/Code/Editor/TrackView/TrackViewDialog.cpp index f1701f9e20..d44d8535de 100644 --- a/Code/Editor/TrackView/TrackViewDialog.cpp +++ b/Code/Editor/TrackView/TrackViewDialog.cpp @@ -77,9 +77,6 @@ inline namespace TrackViewInternal const int s_kMinimumFrameSnappingFPS = 1; const int s_kMaximumFrameSnappingFPS = 120; - const int TRACKVIEW_LAYOUT_VERSION = 0x0001; // Bump this up on every substantial pane layout change - const int TRACKVIEW_REBAR_VERSION = 0x0002; // Bump this up on every substantial rebar change - CTrackViewSequence* GetSequenceByEntityIdOrName(const CTrackViewSequenceManager* pSequenceManager, const char* entityIdOrName) { // the "name" string will be an AZ::EntityId in string form if this was called from