Code/Editor

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago · eaefc580d6
parent fb75e35700
commit eaefc580d6
44 changed files with 17 additions and 163 deletions
--- a/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserRequestHandler.cpp
@ -327,7 +327,7 @@ void AzAssetBrowserRequestHandler::AddContextMenuActions(QWidget* caller, QMenu*
        if (!vetoOpenerFound)
        {
            // if we found no valid openers and no veto openers then just allow it to be opened with the operating system itself.
-            menu->addAction(QObject::tr("Open with associated application..."), [this, fullFilePath]()
+            menu->addAction(QObject::tr("Open with associated application..."), [fullFilePath]()
            {
                OpenWithOS(fullFilePath);
            });
--- a/Code/Editor/Controls/ColorGradientCtrl.h
+++ b/Code/Editor/Controls/ColorGradientCtrl.h
@ -130,7 +130,6 @@ private:
 private:
    ISplineInterpolator* m_pSpline;

-    bool m_bAutoDelete;
    bool m_bNoZoom;

    QRect m_rcClipRect;
--- a/Code/Editor/Controls/ConsoleSCB.cpp
+++ b/Code/Editor/Controls/ConsoleSCB.cpp
@ -298,7 +298,6 @@ Lines CConsoleSCB::s_pendingLines;
 CConsoleSCB::CConsoleSCB(QWidget* parent)
    : QWidget(parent)
    , ui(new Ui::Console())
-    , m_richEditTextLength(0)
    , m_backgroundTheme(gSettings.consoleBackgroundColorTheme)
 {
    m_lines = s_pendingLines;
--- a/Code/Editor/Controls/ConsoleSCB.h
+++ b/Code/Editor/Controls/ConsoleSCB.h
@ -191,7 +191,6 @@ private:
    void OnEditorNotifyEvent(EEditorNotifyEvent event) override;

    QScopedPointer<Ui::Console> ui;
-    int m_richEditTextLength;

    Lines m_lines;
    static Lines s_pendingLines;
--- a/Code/Editor/Controls/SplineCtrl.cpp
+++ b/Code/Editor/Controls/SplineCtrl.cpp
@ -123,8 +123,6 @@ void CSplineCtrl::paintEvent(QPaintEvent* event)
 {
    QPainter painter(this);

-    QRect rcClient = rect();
-
    if (m_pSpline)
    {
        m_bSelectedKeys.resize(m_pSpline->GetKeyCount());
--- a/Code/Editor/Controls/SplineCtrlEx.cpp
+++ b/Code/Editor/Controls/SplineCtrlEx.cpp
@ -819,8 +819,6 @@ void SplineWidget::DrawSpline(QPainter* painter, SSplineInfo& splineInfo, float
 {
    const QPen pOldPen = painter->pen();

-    const QRect rcClip = painter->clipBoundingRect().intersected(m_rcSpline).toRect();
-
    //////////////////////////////////////////////////////////////////////////
    ISplineInterpolator* pSpline = splineInfo.pSpline;
    ISplineInterpolator* pDetailSpline = splineInfo.pDetailSpline;
--- a/Code/Editor/Controls/TimelineCtrl.h
+++ b/Code/Editor/Controls/TimelineCtrl.h
@ -136,7 +136,6 @@ protected:
    void DrawFrameTicks(QPainter* dc);

 private:
-    bool m_bAutoDelete;
    QRect m_rcClient;
    QRect m_rcTimeline;
    float m_fTimeMarker;
--- a/Code/Editor/Controls/WndGridHelper.h
+++ b/Code/Editor/Controls/WndGridHelper.h
@ -81,8 +81,6 @@ public:
            newzoom.y = 0.01f;
        }

-        Vec2 prevz = zoom;
-
        // Zoom to mouse position.
        float ofsx = origin.x;
        float ofsy = origin.y;
--- a/Code/Editor/Core/LevelEditorMenuHandler.cpp
+++ b/Code/Editor/Core/LevelEditorMenuHandler.cpp
@ -41,8 +41,6 @@ using namespace AZ;
 using namespace AzToolsFramework;

 static const char* const s_LUAEditorName = "Lua Editor";
-static const char* const s_shortTimeInterval = "debug";
-static const char* const s_assetImporterMetricsIdentifier = "AssetImporter";

 // top level menu ids
 static const char* const s_fileMenuId = "FileMenu";
@ -50,7 +48,6 @@ static const char* const s_editMenuId = "EditMenu";
 static const char* const s_gameMenuId = "GameMenu";
 static const char* const s_toolMenuId = "ToolMenu";
 static const char* const s_viewMenuId = "ViewMenu";
-static const char* const s_awsMenuId = "AwsMenu";
 static const char* const s_helpMenuId = "HelpMenu";

 static bool CompareLayoutNames(const QString& name1, const QString& name2)
@ -158,12 +155,11 @@ namespace
 }

 LevelEditorMenuHandler::LevelEditorMenuHandler(
-    MainWindow* mainWindow, QtViewPaneManager* const viewPaneManager, QSettings& settings)
+    MainWindow* mainWindow, QtViewPaneManager* const viewPaneManager, [[maybe_unused]] QSettings& settings)
    : QObject(mainWindow)
    , m_mainWindow(mainWindow)
    , m_viewPaneManager(viewPaneManager)
    , m_actionManager(mainWindow->GetActionManager())
-    , m_settings(settings)
 {
 #if defined(AZ_PLATFORM_MAC)
    // Hide the non-native toolbar, then setNativeMenuBar to ensure it is always visible on macOS.
--- a/Code/Editor/Core/LevelEditorMenuHandler.h
+++ b/Code/Editor/Core/LevelEditorMenuHandler.h
@ -106,7 +106,6 @@ private:
    ActionManager::MenuWrapper m_toolsMenu;

    QMenu* m_mostRecentLevelsMenu = nullptr;
-    QMenu* m_mostRecentProjectsMenu = nullptr;
    QMenu* m_editmenu = nullptr;

    ActionManager::MenuWrapper m_viewPanesMenu;
@ -117,7 +116,6 @@ private:
    int m_viewPaneVersion = 0;

    QList<QMenu*> m_topLevelMenus;
-    QSettings& m_settings;
 };

 #endif // LEVELEDITORMENUHANDLER_H
--- a/Code/Editor/CryEditDoc.cpp
+++ b/Code/Editor/CryEditDoc.cpp
@ -1018,14 +1018,6 @@ bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName
    return bSaved;
 }

-
-static void GetUserSettingsFile(const QString& levelFolder, QString& userSettings)
-{
-    const char* pUserName = GetISystem()->GetUserName();
-    QString fileName = QStringLiteral("%1_usersettings.editor_xml").arg(pUserName);
-    userSettings = Path::Make(levelFolder, fileName);
-}
-
 static bool TryRenameFile(const QString& oldPath, const QString& newPath, int retryAttempts=10)
 {
    QFile(newPath).setPermissions(QFile::ReadOther | QFile::WriteOther);
--- a/Code/Editor/CryEditPy.cpp
+++ b/Code/Editor/CryEditPy.cpp
@ -97,11 +97,6 @@ namespace
        }
    }

-    const char* PyGetGameFolder()
-    {
-        return Path::GetEditingGameDataFolder().c_str();
-    }
-
    AZStd::string PyGetGameFolderAsString()
    {
        return Path::GetEditingGameDataFolder();
--- a/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
+++ b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.cpp
@ -13,12 +13,11 @@

 #include "SubObjectSelectionReferenceFrameCalculator.h"

-SubObjectSelectionReferenceFrameCalculator::SubObjectSelectionReferenceFrameCalculator(ESubObjElementType selectionType)
+SubObjectSelectionReferenceFrameCalculator::SubObjectSelectionReferenceFrameCalculator([[maybe_unused]] ESubObjElementType selectionType)
    :   m_anySelected(false)
    , pos(0.0f, 0.0f, 0.0f)
    , normal(0.0f, 0.0f, 0.0f)
    , nNormals(0)
-    , selectionType(selectionType)
    , bUseExplicitFrame(false)
    , bExplicitAnySelected(false)
 {
--- a/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
+++ b/Code/Editor/EditMode/SubObjectSelectionReferenceFrameCalculator.h
@ -32,7 +32,6 @@ private:
    Vec3 pos;
    Vec3 normal;
    int nNormals;
-    ESubObjElementType selectionType;
    std::vector<Vec3> positions;
    Matrix34 m_refFrame;
    bool bUseExplicitFrame;
--- a/Code/Editor/GameExporter.h
+++ b/Code/Editor/GameExporter.h
@ -102,7 +102,6 @@ private:
    AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING

    bool m_bAutoExportMode;
-    int m_numExportedMaterials;

    static CGameExporter* m_pCurrentExporter;
 };
--- a/Code/Editor/LayoutWnd.cpp
+++ b/Code/Editor/LayoutWnd.cpp
@ -183,7 +183,6 @@ void CLayoutWnd::MaximizeViewport(int paneId)

    QString viewClass = m_viewType[paneId];

-    const QRect rc = rect();
    if (!m_bMaximized)
    {
        CLayoutViewPane* pViewPane = GetViewPane(paneId);
--- a/Code/Editor/LevelFileDialog.h
+++ b/Code/Editor/LevelFileDialog.h
@ -64,7 +64,6 @@ private:
    QString m_fileName;
    QString m_filter;
    const bool m_bOpenDialog;
-    bool m_initialized = false;
    LevelTreeModel* const m_model;
    LevelTreeModelFilter* const m_filterModel;
 };
--- a/Code/Editor/LogFile.cpp
+++ b/Code/Editor/LogFile.cpp
@ -180,18 +180,17 @@ void CLogFile::FormatLineV(const char * format, va_list argList)
 void CLogFile::AboutSystem()
 {
    char szBuffer[MAX_LOGBUFFER_SIZE];
-    wchar_t szBufferW[MAX_LOGBUFFER_SIZE];
 #if defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)
    //////////////////////////////////////////////////////////////////////
    // Write the system informations to the log
    //////////////////////////////////////////////////////////////////////

-    wchar_t szLanguageBufferW[64];
    //wchar_t szCPUModel[64];
    MEMORYSTATUS MemoryStatus;
 #endif // defined(AZ_PLATFORM_WINDOWS) || defined(AZ_PLATFORM_LINUX)

 #if defined(AZ_PLATFORM_WINDOWS)
+    wchar_t szLanguageBufferW[64];
    DEVMODE DisplayConfig;
    OSVERSIONINFO OSVerInfo;
    OSVerInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
@ -296,6 +295,7 @@ AZ_POP_DISABLE_WARNING
    //////////////////////////////////////////////////////////////////////

    str += " (";
+    wchar_t szBufferW[MAX_LOGBUFFER_SIZE];
    GetWindowsDirectoryW(szBufferW, sizeof(szBufferW));
    AZStd::to_string(szBuffer, MAX_LOGBUFFER_SIZE, szBufferW);
    str += szBuffer;
--- a/Code/Editor/Objects/ObjectManager.cpp
+++ b/Code/Editor/Objects/ObjectManager.cpp
@ -1556,11 +1556,8 @@ void CObjectManager::DeleteSelection()
    // Make sure to unlock selection.
    GetIEditor()->LockSelection(false);

-    GUID bID = GUID_NULL;
-
-    int i;
    CSelectionGroup objects;
-    for (i = 0; i < m_currSelection->GetCount(); i++)
+    for (int i = 0; i < m_currSelection->GetCount(); i++)
    {
        // Check condition(s) if object could be deleted
        if (!IsObjectDeletionAllowed(m_currSelection->GetObject(i)))
@ -2900,17 +2897,6 @@ namespace
        return AZ::Vector3(position.x, position.y, position.z);
    }

-    AZ::Vector3 PyGetWorldObjectPosition(const char* pName)
-    {
-        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
-        if (!pObject)
-        {
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid object.").toUtf8().data());
-        }
-        Vec3 position = pObject->GetWorldPos();
-        return AZ::Vector3(position.x, position.y, position.z);
-    }
-
    void PySetObjectPosition(const char* pName, float fValueX, float fValueY, float fValueZ)
    {
        CBaseObject* pObject = GetIEditor()->GetObjectManager()->FindObject(pName);
--- a/Code/Editor/Objects/SelectionGroup.cpp
+++ b/Code/Editor/Objects/SelectionGroup.cpp
@ -316,8 +316,6 @@ void CSelectionGroup::Rotate(const Ang3& angles, int referenceCoordSys)
    //  return;

    // Rotate selection about selection center.
-    Vec3 center = GetCenter();
-
    Matrix34 rotateTM = Matrix34::CreateRotationXYZ(DEG2RAD(angles));
    Rotate(rotateTM, referenceCoordSys);
 }
--- a/Code/Editor/Objects/TrackGizmo.cpp
+++ b/Code/Editor/Objects/TrackGizmo.cpp
@ -176,7 +176,6 @@ void CTrackGizmo::DrawAxis(DisplayContext& dc, const Vec3& org)
    z = z * fScreenScale;

    float col[4] = { 1, 1, 1, 1 };
-    float hcol[4] = { 1, 0, 0, 1 };
    dc.renderer->DrawLabelEx(org + x, 1.2f, col, true, true, "X");
    dc.renderer->DrawLabelEx(org + y, 1.2f, col, true, true, "Y");
    dc.renderer->DrawLabelEx(org + z, 1.2f, col, true, true, "Z");
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@ -528,7 +528,6 @@ void SandboxIntegrationManager::EntityParentChanged(
        oldAncestor = nextParentId;
    } while (oldAncestor.IsValid());

-    AZ::EntityId newAncestors = newParentId;
    AZ::EntityId newAncestor = newParentId;

    bool isGoingToRootScene = false;
@ -721,7 +720,7 @@ void SandboxIntegrationManager::PopulateEditorGlobalContextMenu(QMenu* menu, con
        if (selected.size() > 0)
        {
            action = menu->addAction(QObject::tr("Find in Entity Outliner"));
-            QObject::connect(action, &QAction::triggered, [this, selected]
+            QObject::connect(action, &QAction::triggered, [selected]
            {
                AzToolsFramework::EditorEntityContextNotificationBus::Broadcast(&EditorEntityContextNotification::OnFocusInEntityOutliner, selected);
            });
@ -842,7 +841,7 @@ void SandboxIntegrationManager::SetupLayerContextMenu(QMenu* menu)

            QAction* findLayerAssetAction = menu->addAction(QObject::tr("Find layer in Asset Browser"));
            findLayerAssetAction->setToolTip(QObject::tr("Selects this layer in the Asset Browser"));
-            QObject::connect(findLayerAssetAction, &QAction::triggered, [this, fullFilePath] {
+            QObject::connect(findLayerAssetAction, &QAction::triggered, [fullFilePath] {
                QtViewPaneManager::instance()->OpenPane(LyViewPane::AssetBrowser);

                AzToolsFramework::AssetBrowser::AssetBrowserViewRequestBus::Broadcast(
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.h
@ -280,7 +280,6 @@ private:

 private:
    AZ::Vector2 m_contextMenuViewPoint;
-    AZ::Vector3 m_sliceWorldPos;

    int m_inObjectPickMode;
    short m_startedUndoRecordingNestingLevel;   // used in OnBegin/EndUndo to ensure we only accept undo's we started recording
@ -298,8 +297,6 @@ private:
    const AZStd::string m_defaultComponentViewportIconLocation = "Icons/Components/Viewport/Component_Placeholder.svg";
    const AZStd::string m_defaultEntityIconLocation = "Icons/Components/Viewport/Transform.svg";

-    bool m_debugDisplayBusImplementationActive = false;
-
    AzToolsFramework::Prefab::PrefabIntegrationManager* m_prefabIntegrationManager = nullptr;

    AzToolsFramework::EditorEntityUiInterface* m_editorEntityUiInterface = nullptr;
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
@ -1234,8 +1234,6 @@ bool OutlinerListModel::ReparentEntities(const AZ::EntityId& newParentId, const
 QMimeData* OutlinerListModel::mimeData(const QModelIndexList& indexes) const
 {
    AZ_PROFILE_FUNCTION(AzToolsFramework);
-    AZ::TypeId uuid1 = AZ::AzTypeInfo<AZ::Entity>::Uuid();
-    AZ::TypeId uuid2 = AZ::AzTypeInfo<AzToolsFramework::EditorEntityIdContainer>::Uuid();

    AzToolsFramework::EditorEntityIdContainer entityIdList;
    for (const QModelIndex& index : indexes)
@ -1462,13 +1460,11 @@ void OutlinerListModel::OnEntityRuntimeActivationChanged(AZ::EntityId entityId,
    QueueEntityUpdate(entityId);
 }

-void OutlinerListModel::OnEntityInfoUpdatedRemoveChildBegin(AZ::EntityId parentId, AZ::EntityId childId)
+void OutlinerListModel::OnEntityInfoUpdatedRemoveChildBegin([[maybe_unused]] AZ::EntityId parentId, [[maybe_unused]] AZ::EntityId childId)
 {
    //add/remove operations trigger selection change signals which assert and break undo/redo operations in progress in inspector etc.
    //so disallow selection updates until change is complete
    emit EnableSelectionUpdates(false);
-    auto parentIndex = GetIndexFromEntity(parentId);
-    auto childIndex = GetIndexFromEntity(childId);
    beginResetModel();
 }

--- a/Code/Editor/PythonEditorFuncs.cpp
+++ b/Code/Editor/PythonEditorFuncs.cpp
@ -33,18 +33,6 @@

 namespace
 {
-    //////////////////////////////////////////////////////////////////////////
-    const char* PyGetCVar(const char* pName)
-    {
-        ICVar* pCVar = GetIEditor()->GetSystem()->GetIConsole()->GetCVar(pName);
-        if (!pCVar)
-        {
-            Warning("PyGetCVar: Attempt to access non-existent CVar '%s'", pName ? pName : "(null)");
-            throw std::logic_error((QString("\"") + pName + "\" is an invalid cvar.").toUtf8().data());
-        }
-        return pCVar->GetString();
-    }
-
    //////////////////////////////////////////////////////////////////////////
    const char* PyGetCVarAsString(const char* pName)
    {
@ -212,52 +200,6 @@ namespace
        return GetIEditor()->IsInSimulationMode();
    }

-    //////////////////////////////////////////////////////////////////////////
-    QString PyNewObject(const char* typeName, const char* fileName, const char* name, float x, float y, float z)
-    {
-        CBaseObject* object = GetIEditor()->NewObject(typeName, fileName, name, x, y, z);
-        if (object)
-        {
-            return object->GetName();
-        }
-        else
-        {
-            return "";
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////
-    QString PyNewObjectAtCursor(const char* typeName, const char* fileName, const char* name)
-    {
-        CUndo undo("Create new object");
-
-        Vec3 pos(0, 0, 0);
-
-        QPoint p = QCursor::pos();
-        CViewport* viewport = GetIEditor()->GetViewManager()->GetViewportAtPoint(p);
-        if (viewport)
-        {
-            viewport->ScreenToClient(p);
-            if (GetIEditor()->GetAxisConstrains() != AXIS_TERRAIN)
-            {
-                pos = viewport->MapViewToCP(p);
-            }
-            else
-            {
-                // Snap to terrain.
-                bool hitTerrain;
-                pos = viewport->ViewToWorld(p, &hitTerrain);
-                if (hitTerrain)
-                {
-                    pos.z = GetIEditor()->GetTerrainElevation(pos.x, pos.y) + 1.0f;
-                }
-                pos = viewport->SnapToGrid(pos);
-            }
-        }
-
-        return PyNewObject(typeName, fileName, name, pos.x, pos.y, pos.z);
-    }
-
    //////////////////////////////////////////////////////////////////////////
    void PyRunConsole(const char* text)
    {
--- a/Code/Editor/QtViewPaneManager.cpp
+++ b/Code/Editor/QtViewPaneManager.cpp
@ -240,14 +240,13 @@ static bool SkipTitleBarOverdraw(QtViewPane* pane)
    return !pane->m_options.isDockable;
 }

-DockWidget::DockWidget(QWidget* widget, QtViewPane* pane, QSettings* settings, QMainWindow* parent, AzQtComponents::FancyDocking* advancedDockManager)
+DockWidget::DockWidget(QWidget* widget, QtViewPane* pane, [[maybe_unused]] QSettings* settings, QMainWindow* parent, AzQtComponents::FancyDocking* advancedDockManager)
    : AzQtComponents::StyledDockWidget(pane->m_name, SkipTitleBarOverdraw(pane),
 #if AZ_TRAIT_OS_PLATFORM_APPLE
          pane->m_options.detachedWindow ? nullptr : parent)
 #else
          parent)
 #endif
-    , m_settings(settings)
    , m_mainWindow(parent)
    , m_pane(pane)
    , m_advancedDockManager(advancedDockManager)
--- a/Code/Editor/QtViewPaneManager.h
+++ b/Code/Editor/QtViewPaneManager.h
@ -67,7 +67,6 @@ private:
    void reparentToMainWindowFix();
    QRect ProperGeometry() const;
    QString settingsKey() const;
-    QSettings* const m_settings;
    QMainWindow* const m_mainWindow;
    QtViewPane* const m_pane;
    AzQtComponents::FancyDocking* m_advancedDockManager;
--- a/Code/Editor/RenderHelpers/AxisHelperShared.inl
+++ b/Code/Editor/RenderHelpers/AxisHelperShared.inl
@ -191,7 +191,6 @@ void CAxisHelper::DrawAxis(const Matrix34& worldTM, const SGizmoParameters& setu
    {
        if (axis)
        {
-            float col[4] = { 1, 0, 0, 1 };
            if (axis == AXIS_X || axis == AXIS_XY || axis == AXIS_XZ || axis == AXIS_XYZ)
            {
                colX = colSelected;
@ -436,7 +435,6 @@ void CAxisHelper::DrawAxis(const Matrix34& worldTM, const SGizmoParameters& setu
            {
                dc.SetColor(QColor(128, 32, 32), 0.4f);
            }
-            Vec3 org = worldTM.GetTranslation();
            dc.DrawBall(Vec3(0.0f),  m_size * kSelectionBallScale);
        }

--- a/Code/Editor/StartupTraceHandler.cpp
+++ b/Code/Editor/StartupTraceHandler.cpp
@ -168,7 +168,7 @@ namespace SandboxEditor

    void StartupTraceHandler::ShowMessageBox(const QString& message)
    {
-        AZ::SystemTickBus::QueueFunction([this, message]()
+        AZ::SystemTickBus::QueueFunction([message]()
        {
            // Parent to the main window, so that the error dialog doesn't
            // show up as a separate window when alt-tabbing.
--- a/Code/Editor/ToolbarManager.cpp
+++ b/Code/Editor/ToolbarManager.cpp
@ -1217,7 +1217,6 @@ void EditableQToolBar::dropEvent(QDropEvent* ev)
        return;
    }

-    const int actionId = action->data().toInt();
    QWidget* beforeWidget = insertPositionForDrop(ev->pos());
    QAction* beforeAction = beforeWidget ? ActionForWidget(beforeWidget) : nullptr;

--- a/Code/Editor/TrackView/DirectorNodeAnimator.cpp
+++ b/Code/Editor/TrackView/DirectorNodeAnimator.cpp
@ -19,8 +19,7 @@


 ////////////////////////////////////////////////////////////////////////////
-CDirectorNodeAnimator::CDirectorNodeAnimator(CTrackViewAnimNode* pDirectorNode)
-    : m_pDirectorNode(pDirectorNode)
+CDirectorNodeAnimator::CDirectorNodeAnimator([[maybe_unused]] CTrackViewAnimNode* pDirectorNode)
 {
    assert(m_pDirectorNode != nullptr);
 }
@ -139,7 +138,6 @@ void CDirectorNodeAnimator::ForEachActiveSequence(const SAnimContext& ac, CTrack
    const bool bHandleOtherKeys, std::function<void(CTrackViewSequence*, const SAnimContext&)> animateFunction,
    std::function<void(CTrackViewSequence*, const SAnimContext&)> resetFunction)
 {
-    const float time = ac.time;
    const unsigned int numKeys = pSequenceTrack->GetKeyCount();

    if (bHandleOtherKeys)
--- a/Code/Editor/TrackView/DirectorNodeAnimator.h
+++ b/Code/Editor/TrackView/DirectorNodeAnimator.h
@ -34,7 +34,5 @@ private:
    void ForEachActiveSequence(const SAnimContext& ac, CTrackViewTrack* pSequenceTrack,
        const bool bHandleOtherKeys, std::function<void(CTrackViewSequence*, const SAnimContext&)> animateFunction,
        std::function<void(CTrackViewSequence*, const SAnimContext&)> resetFunction);
-
-    CTrackViewAnimNode* m_pDirectorNode;
 };
 #endif // CRYINCLUDE_EDITOR_TRACKVIEW_DIRECTORNODEANIMATOR_H
--- a/Code/Editor/TrackView/TrackViewAnimNode.cpp
+++ b/Code/Editor/TrackView/TrackViewAnimNode.cpp
@ -1820,7 +1820,6 @@ bool CTrackViewAnimNode::IsDisabled() const
 //////////////////////////////////////////////////////////////////////////
 void CTrackViewAnimNode::SetPos(const Vec3& position)
 {
-    const float time = GetSequence()->GetTime();
    CTrackViewTrack* track = GetTrackForParameter(AnimParamType::Position);

    if (track)
--- a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
+++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
@ -199,7 +199,6 @@ void CTrackViewDopeSheetBase::SetTimeRange(float start, float end)
 void CTrackViewDopeSheetBase::SetTimeScale(float timeScale, float fAnchorTime)
 {
    const double fOldOffset = -fAnchorTime * m_timeScale;
-    const double fOldScale = m_timeScale;

    timeScale = std::max(timeScale, 0.001f);
    timeScale = std::min(timeScale, 100000.0f);
@ -1426,8 +1425,6 @@ void CTrackViewDopeSheetBase::OnCaptureChanged()
 //////////////////////////////////////////////////////////////////////////
 bool CTrackViewDopeSheetBase::IsOkToAddKeyHere(const CTrackViewTrack* pTrack, float time) const
 {
-    const float timeEpsilon = 0.05f;
-
    for (unsigned int i = 0; i < pTrack->GetKeyCount(); ++i)
    {
        const CTrackViewKeyConstHandle& keyHandle = pTrack->GetKey(i);
@ -2152,8 +2149,6 @@ void CTrackViewDopeSheetBase::AcceptUndo()
 {
    if (CUndo::IsRecording())
    {
-        const QPoint mousePos = mapFromGlobal(QCursor::pos());
-
        CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();

        if (m_mouseMode == eTVMouseMode_Paste)
@ -2623,7 +2618,6 @@ void CTrackViewDopeSheetBase::DrawBoolTrack(const Range& timeRange, QPainter* pa
 {
    int x0 = TimeToClient(timeRange.start);
    float t0 = timeRange.start;
-    QRect trackRect;

    const QBrush prevBrush = painter->brush();
    painter->setBrush(m_visibilityBrush);
@ -2752,7 +2746,6 @@ void CTrackViewDopeSheetBase::DrawKeys(CTrackViewTrack* pTrack, QPainter* painte
        }

        int x1 = x + kDefaultWidthForDescription;
-        CTrackViewKeyHandle nextKey = keyHandle.GetNextKey();

        int nextKeyIndex = i + 1;

--- a/Code/Editor/TrackView/TrackViewNode.h
+++ b/Code/Editor/TrackView/TrackViewNode.h
@ -22,13 +22,11 @@ class CTrackViewKeyConstHandle
 {
 public:
    CTrackViewKeyConstHandle()
-        : m_bIsValid(false)
-        , m_keyIndex(0)
+        : m_keyIndex(0)
        , m_pTrack(nullptr) {}

    CTrackViewKeyConstHandle(const CTrackViewTrack* pTrack, unsigned int keyIndex)
-        : m_bIsValid(true)
-        , m_keyIndex(keyIndex)
+        : m_keyIndex(keyIndex)
        , m_pTrack(pTrack) {}

    void GetKey(IKey* pKey) const;
@ -36,7 +34,6 @@ public:
    const CTrackViewTrack* GetTrack() const { return m_pTrack; }

 private:
-    bool m_bIsValid;
    unsigned int m_keyIndex;
    const CTrackViewTrack* m_pTrack;
 };
--- a/Code/Editor/TrackView/TrackViewNodes.h
+++ b/Code/Editor/TrackView/TrackViewNodes.h
@ -202,7 +202,6 @@ private:

    // Drag and drop
    CTrackViewAnimNodeBundle m_draggedNodes;
-    CTrackViewAnimNode* m_pDragTarget;

    std::unordered_map<unsigned int, CAnimParamType> m_menuParamTypeMap;
    std::unordered_map<const CTrackViewNode*, CRecord*> m_nodeToRecordMap;
--- a/Code/Editor/TrackView/TrackViewSequence.cpp
+++ b/Code/Editor/TrackView/TrackViewSequence.cpp
@ -135,9 +135,7 @@ CTrackViewKeyHandle CTrackViewSequence::FindSingleSelectedKey()

 //////////////////////////////////////////////////////////////////////////
 void CTrackViewSequence::OnEntityComponentPropertyChanged(AZ::ComponentId changedComponentId)
-{
-    const AZ::EntityId entityId = *AzToolsFramework::PropertyEditorEntityChangeNotificationBus::GetCurrentBusId();
-   
+{  
    // find the component node for this changeComponentId if it exists
    for (int i = m_pAnimSequence->GetNodeCount(); --i >= 0;)
    {
--- a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
+++ b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
@ -611,7 +611,6 @@ void CTrackViewSplineCtrl::mouseMoveEvent(QMouseEvent* event)

    CTrackViewSequenceNotificationContext context(pSequence);

-    QPoint cMousePosPrev = m_cMousePos;
    m_cMousePos = point;

    if (m_editMode == NothingMode)
--- a/Code/Editor/Util/ColumnGroupTreeView.h
+++ b/Code/Editor/Util/ColumnGroupTreeView.h
@ -71,7 +71,6 @@ private:
    ColumnGroupHeaderView* m_header;
    ColumnGroupProxyModel* m_groupModel;
    QSet<QString> m_openNodes;
-    bool m_showGroups;
 };

 #endif // COLUMNGROUPTREEVIEW_H
--- a/Code/Editor/Util/Image.h
+++ b/Code/Editor/Util/Image.h
@ -178,7 +178,6 @@ public:
    //////////////////////////////////////////////////////////////////////////
    void GetSubImage(int x1, int y1, int width, int height, TImage<T>& img) const
    {
-        int size = width * height;
        img.Allocate(width, height);
        for (int y = 0; y < height; y++)
        {
--- a/Code/Editor/Util/ImageASC.cpp
+++ b/Code/Editor/Util/ImageASC.cpp
@ -99,7 +99,7 @@ bool CImageASC::Load(const QString& fileName, CFloatImage& image)

    // Break all of the values in the file apart into tokens.

-    char* nextToken = nullptr;
+    [[maybe_unused]] char* nextToken = nullptr;
    token = azstrtok(str, 0, seps, &nextToken);

    // ncols = grid width
--- a/Code/Editor/Util/ImageGif.cpp
+++ b/Code/Editor/Util/ImageGif.cpp
@ -76,8 +76,6 @@ static int  numused;
 const char* id87 = "GIF87a";
 const char* id89 = "GIF89a";

-static int   log2 (int);
-
 /* Fetch the next code from the raster data stream.  The codes can be
 * any length from 3 to 12 bits, packed into 8-bit bytes, so we have to
 * maintain our location in the Raster array as a BIT Offset.  We compute
--- a/Code/Editor/Util/ImageUtil.cpp
+++ b/Code/Editor/Util/ImageUtil.cpp
@ -145,7 +145,7 @@ bool CImageUtil::LoadPGM(const QString& fileName, CImageEx& image)
    char* str = new char[fileSize];
    fread(str, fileSize, 1, file);

-    char* nextToken = nullptr;
+    [[maybe_unused]] char* nextToken = nullptr;
    token = azstrtok(str, 0, seps, &nextToken);

    while (token != nullptr && token[0] == '#')
--- a/Code/Editor/ViewPane.h
+++ b/Code/Editor/ViewPane.h
@ -118,7 +118,6 @@ private:

    int m_id;
    int m_nBorder;
-    int m_titleHeight;

    QWidget* m_viewport;
    QScrollArea* m_viewportScrollArea = nullptr;