diff --git a/Assets/Editor/Prefabs/Default_Level.prefab b/Assets/Editor/Prefabs/Default_Level.prefab
index 64656e1e2f..d02d669f53 100644
--- a/Assets/Editor/Prefabs/Default_Level.prefab
+++ b/Assets/Editor/Prefabs/Default_Level.prefab
@@ -212,10 +212,10 @@
"Configuration": {
"ModelAsset": {
"assetId": {
- "guid": "{935F694A-8639-515B-8133-81CDC7948E5B}",
- "subId": 277333723
+ "guid": "{0CD745C0-6AA8-569A-A68A-73A3270986C4}",
+ "subId": 277889906
},
- "assetHint": "objects/groudplane/groundplane_521x521m.azmodel"
+ "assetHint": "objects/groudplane/groundplane_512x512m.azmodel"
}
}
}
diff --git a/Assets/Editor/Translation/scriptcanvas_en_us.ts b/Assets/Editor/Translation/scriptcanvas_en_us.ts
index f057ba2f30..937f6a4d96 100644
--- a/Assets/Editor/Translation/scriptcanvas_en_us.ts
+++ b/Assets/Editor/Translation/scriptcanvas_en_us.ts
@@ -2771,6 +2771,80 @@
VECTOR2_CREATEONE_OUTPUT0_TOOLTIP
+
+ VECTOR2_DIRECTIONTO_NAME
+ Class/Bus: Vector2 Event/Method: DirectionTo
+ Get Direction Vector
+
+
+ VECTOR2_DIRECTIONTO_TOOLTIP
+ Returns a direction vector between two points and the distance between them, by default the direction will be normalized, it may be optionally scaled using the Scale parameter if different from 1.0
+
+
+ VECTOR2_DIRECTIONTO_CATEGORY
+
+
+
+ VECTOR2_DIRECTIONTO_OUT_NAME
+
+
+
+ VECTOR2_DIRECTIONTO_OUT_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTOL_IN_NAME
+
+
+
+ VECTOR2_DIRECTIONTO_IN_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT0_NAME
+ C++ Type: const Vector2
+ Direction
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT0_TOOLTIP
+ The direction between To and From normalized and optionally scaled
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT1_NAME
+ C++ Type: float
+ Distance
+
+
+ VECTOR2_DIRECTIONTO_OUTPUT1_TOOLTIP
+ The distance between To and From
+
+
+ VECTOR2_DIRECTIONTO_PARAM0_NAME
+ Simple Type: Vector2 C++ Type: Vector2*
+ From
+
+
+ VECTOR2_DIRECTIONTO_PARAM0_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTO_PARAM1_NAME
+ Simple Type: Vector2 C++ Type: Vector2*
+ To
+
+
+ VECTOR2_DIRECTIONTO_PARAM1_TOOLTIP
+
+
+
+ VECTOR2_DIRECTIONTO_PARAM2_NAME
+ Simple Type: Vector2 C++ Type: Vector2*
+ Scale
+
+
+ VECTOR2_DIRECTIONTO_PARAM2_TOOLTIP
+
+
VECTOR2_GETPROJECTED_NAME
Class/Bus: Vector2 Event/Method: GetProjected
@@ -32262,6 +32336,80 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
VECTOR4_GETRECIPROCAL_PARAM0_TOOLTIP
+
+ VECTOR4_DIRECTIONTO_NAME
+ Class/Bus: Vector4 Event/Method: DirectionTo
+ Get Direction Vector
+
+
+ VECTOR4_DIRECTIONTO_TOOLTIP
+ Returns a direction vector between two points and the distance between them, by default the direction will be normalized, it may be optionally scaled using the Scale parameter if different from 1.0
+
+
+ VECTOR4_DIRECTIONTO_CATEGORY
+
+
+
+ VECTOR4_DIRECTIONTO_OUT_NAME
+
+
+
+ VECTOR4_DIRECTIONTO_OUT_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTOL_IN_NAME
+
+
+
+ VECTOR4_DIRECTIONTO_IN_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT0_NAME
+ C++ Type: const Vector4
+ Direction
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT0_TOOLTIP
+ The direction between To and From normalized and optionally scaled
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT1_NAME
+ C++ Type: float
+ Distance
+
+
+ VECTOR4_DIRECTIONTO_OUTPUT1_TOOLTIP
+ The distance between To and From
+
+
+ VECTOR4_DIRECTIONTO_PARAM0_NAME
+ Simple Type: Vector4 C++ Type: Vector4*
+ From
+
+
+ VECTOR4_DIRECTIONTO_PARAM0_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTO_PARAM1_NAME
+ Simple Type: Vector4 C++ Type: Vector4*
+ To
+
+
+ VECTOR4_DIRECTIONTO_PARAM1_TOOLTIP
+
+
+
+ VECTOR4_DIRECTIONTO_PARAM2_NAME
+ Simple Type: Vector4 C++ Type: Vector4*
+ Scale
+
+
+ VECTOR4_DIRECTIONTO_PARAM2_TOOLTIP
+
+
VECTOR4_AXISX_NAME
Class/Bus: Vector4 Event/Method: CreateAxisX
@@ -37469,6 +37617,80 @@ An Entity can be selected by using the pick button, or by dragging an Entity fro
VECTOR3_GETRECIPROCAL_PARAM0_TOOLTIP
+
+ VECTOR3_DIRECTIONTO_NAME
+ Class/Bus: Vector3 Event/Method: DirectionTo
+ Get Direction Vector
+
+
+ VECTOR3_DIRECTIONTO_TOOLTIP
+ Returns a direction vector between two points and the distance between them, by default the direction will be normalized, it may be optionally scaled using the Scale parameter if different from 1.0
+
+
+ VECTOR3_DIRECTIONTO_CATEGORY
+
+
+
+ VECTOR3_DIRECTIONTO_OUT_NAME
+
+
+
+ VECTOR3_DIRECTIONTO_OUT_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTOL_IN_NAME
+
+
+
+ VECTOR3_DIRECTIONTO_IN_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT0_NAME
+ C++ Type: const Vector3
+ Direction
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT0_TOOLTIP
+ The direction between To and From normalized and optionally scaled
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT1_NAME
+ C++ Type: float
+ Distance
+
+
+ VECTOR3_DIRECTIONTO_OUTPUT1_TOOLTIP
+ The distance between To and From
+
+
+ VECTOR3_DIRECTIONTO_PARAM0_NAME
+ Simple Type: Vector3 C++ Type: Vector3*
+ From
+
+
+ VECTOR3_DIRECTIONTO_PARAM0_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTO_PARAM1_NAME
+ Simple Type: Vector3 C++ Type: Vector3*
+ To
+
+
+ VECTOR3_DIRECTIONTO_PARAM1_TOOLTIP
+
+
+
+ VECTOR3_DIRECTIONTO_PARAM2_NAME
+ Simple Type: Vector3 C++ Type: Vector3*
+ Scale
+
+
+ VECTOR3_DIRECTIONTO_PARAM2_TOOLTIP
+
+
VECTOR3_PROJECT_NAME
Class/Bus: Vector3 Event/Method: Project
diff --git a/Code/Editor/Animation/SkeletonHierarchy.cpp b/Code/Editor/Animation/SkeletonHierarchy.cpp
index 3015ff5e27..d1cc44b31d 100644
--- a/Code/Editor/Animation/SkeletonHierarchy.cpp
+++ b/Code/Editor/Animation/SkeletonHierarchy.cpp
@@ -63,7 +63,7 @@ int32 CHierarchy::FindNodeIndexByName(const char* name) const
const CHierarchy::SNode* CHierarchy::FindNode(const char* name) const
{
int32 index = FindNodeIndexByName(name);
- return index < 0 ? NULL : &m_nodes[index];
+ return index < 0 ? nullptr : &m_nodes[index];
}
void CHierarchy::CreateFrom(IDefaultSkeleton* pIDefaultSkeleton)
diff --git a/Code/Editor/Animation/SkeletonMapper.cpp b/Code/Editor/Animation/SkeletonMapper.cpp
index 3913801fc8..24f01f56ad 100644
--- a/Code/Editor/Animation/SkeletonMapper.cpp
+++ b/Code/Editor/Animation/SkeletonMapper.cpp
@@ -56,8 +56,8 @@ void CMapper::ClearLocations()
uint32 count = uint32(m_nodes.size());
for (uint32 i = 0; i < count; ++i)
{
- m_nodes[i].position = NULL;
- m_nodes[i].orientation = NULL;
+ m_nodes[i].position = nullptr;
+ m_nodes[i].orientation = nullptr;
}
m_locations.clear();
@@ -141,7 +141,7 @@ void CMapper::Map(QuatT* pResult)
}
CHierarchy::SNode* pParent = pNode->parent < 0 ?
- NULL : m_hierarchy.GetNode(pNode->parent);
+ nullptr : m_hierarchy.GetNode(pNode->parent);
if (pParent)
{
pResult[i].t =
@@ -173,7 +173,7 @@ void CMapper::Map(QuatT* pResult)
}
CHierarchy::SNode* pParent = pNode->parent < 0 ?
- NULL : m_hierarchy.GetNode(pNode->parent);
+ nullptr : m_hierarchy.GetNode(pNode->parent);
if (!pParent)
{
pResult[i].q = absolutes[i];
diff --git a/Code/Editor/Animation/SkeletonMapperOperator.cpp b/Code/Editor/Animation/SkeletonMapperOperator.cpp
index 7a69173bed..cc53957115 100644
--- a/Code/Editor/Animation/SkeletonMapperOperator.cpp
+++ b/Code/Editor/Animation/SkeletonMapperOperator.cpp
@@ -37,8 +37,8 @@ CMapperOperatorDesc::CMapperOperatorDesc(const char* name)
CMapperOperator::CMapperOperator(const char* className, uint32 positionCount, uint32 orientationCount)
{
m_className = className;
- m_position.resize(positionCount, NULL);
- m_orientation.resize(orientationCount, NULL);
+ m_position.resize(positionCount, nullptr);
+ m_orientation.resize(orientationCount, nullptr);
}
CMapperOperator::~CMapperOperator()
diff --git a/Code/Editor/AnimationContext.cpp.rej b/Code/Editor/AnimationContext.cpp.rej
deleted file mode 100644
index 3ee0913c9d..0000000000
--- a/Code/Editor/AnimationContext.cpp.rej
+++ /dev/null
@@ -1,11 +0,0 @@
---- Editor/AnimationContext.cpp
-+++ Editor/AnimationContext.cpp
-@@ -612,7 +612,7 @@ void CAnimationContext::UpdateAnimatedLights()
- return;
-
- std::vector entityObjects;
-- GetIEditor()->GetObjectManager()->FindObjectsOfType(entityObjects);
-+ GetIEditor()->GetObjectManager()->FindObjectsOfType(&CEntityObject::staticMetaObject, entityObjects);
- std::for_each(std::begin(entityObjects), std::end(entityObjects),
- [this](CBaseObject *pBaseObject)
- {
diff --git a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
index f1047ae62b..c93ad087ce 100644
--- a/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
+++ b/Code/Editor/AzAssetBrowser/AzAssetBrowserWindow.cpp
@@ -42,7 +42,7 @@ public:
AzToolsFramework::EditorEvents::Bus::Handler::BusConnect();
}
- ~ListenerForShowAssetEditorEvent()
+ ~ListenerForShowAssetEditorEvent() override
{
AzToolsFramework::EditorEvents::Bus::Handler::BusDisconnect();
}
diff --git a/Code/Editor/Commands/CommandManager.cpp b/Code/Editor/Commands/CommandManager.cpp
index 90059ea195..0712e35e79 100644
--- a/Code/Editor/Commands/CommandManager.cpp
+++ b/Code/Editor/Commands/CommandManager.cpp
@@ -20,8 +20,8 @@
// AzToolsFramework
#include
-CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pFirst = 0;
-CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pLast = 0;
+CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pFirst = nullptr;
+CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::s_pLast = nullptr;
CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::GetFirst()
{
@@ -31,7 +31,7 @@ CAutoRegisterCommandHelper* CAutoRegisterCommandHelper::GetFirst()
CAutoRegisterCommandHelper::CAutoRegisterCommandHelper(void(*registerFunc)(CEditorCommandManager &))
{
m_registerFunc = registerFunc;
- m_pNext = 0;
+ m_pNext = nullptr;
if (!s_pLast)
{
diff --git a/Code/Editor/Commands/CommandManager.h b/Code/Editor/Commands/CommandManager.h
index 2ec4a137bc..761c79f79c 100644
--- a/Code/Editor/Commands/CommandManager.h
+++ b/Code/Editor/Commands/CommandManager.h
@@ -38,7 +38,7 @@ public:
void RegisterAutoCommands();
- bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = NULL);
+ bool AddCommand(CCommand* pCommand, TPfnDeleter deleter = nullptr);
bool UnregisterCommand(const char* module, const char* name);
bool RegisterUICommand(
const char* module,
diff --git a/Code/Editor/Controls/BitmapToolTip.h b/Code/Editor/Controls/BitmapToolTip.h
index d4bb89c625..5b7c56cbf3 100644
--- a/Code/Editor/Controls/BitmapToolTip.h
+++ b/Code/Editor/Controls/BitmapToolTip.h
@@ -42,7 +42,7 @@ public:
CBitmapToolTip(QWidget* parent = nullptr);
virtual ~CBitmapToolTip();
- BOOL Create(const RECT& rect);
+ bool Create(const RECT& rect);
// Attributes
public:
diff --git a/Code/Editor/Controls/ColorGradientCtrl.cpp b/Code/Editor/Controls/ColorGradientCtrl.cpp
index 555d285192..3bd3b11690 100644
--- a/Code/Editor/Controls/ColorGradientCtrl.cpp
+++ b/Code/Editor/Controls/ColorGradientCtrl.cpp
@@ -29,7 +29,7 @@ CColorGradientCtrl::CColorGradientCtrl(QWidget* parent)
m_nHitKeyIndex = -1;
m_nKeyDrawRadius = 3;
m_bTracking = false;
- m_pSpline = 0;
+ m_pSpline = nullptr;
m_fMinTime = -1;
m_fMaxTime = 1;
m_fMinValue = -1;
@@ -474,7 +474,7 @@ void CColorGradientCtrl::SetActiveKey(int nIndex)
}
/////////////////////////////////////////////////////////////////////////////
-void CColorGradientCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
+void CColorGradientCtrl::SetSpline(ISplineInterpolator* pSpline, bool bRedraw)
{
if (pSpline != m_pSpline)
{
@@ -501,7 +501,7 @@ ISplineInterpolator* CColorGradientCtrl::GetSpline()
/////////////////////////////////////////////////////////////////////////////
void CColorGradientCtrl::keyPressEvent(QKeyEvent* event)
{
- BOOL bProcessed = false;
+ bool bProcessed = false;
if (m_nActiveKey != -1 && m_pSpline)
{
diff --git a/Code/Editor/Controls/ColorGradientCtrl.h b/Code/Editor/Controls/ColorGradientCtrl.h
index 9533fecdfa..80d8b966f4 100644
--- a/Code/Editor/Controls/ColorGradientCtrl.h
+++ b/Code/Editor/Controls/ColorGradientCtrl.h
@@ -54,7 +54,7 @@ public:
// Lock value of first and last key to be the same.
void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
- void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
+ void SetSpline(ISplineInterpolator* pSpline, bool bRedraw = false);
ISplineInterpolator* GetSpline();
void SetTimeMarker(float fTime);
diff --git a/Code/Editor/Controls/ConsoleSCB.cpp b/Code/Editor/Controls/ConsoleSCB.cpp
index 9f1921395c..7f018e0286 100644
--- a/Code/Editor/Controls/ConsoleSCB.cpp
+++ b/Code/Editor/Controls/ConsoleSCB.cpp
@@ -62,14 +62,14 @@ public:
}
protected:
- void highlightBlock(const QString &text)
+ void highlightBlock(const QString &text) override
{
auto pos = -1;
QTextCharFormat myClassFormat;
myClassFormat.setFontWeight(QFont::Bold);
myClassFormat.setBackground(Qt::yellow);
- while (1)
+ while (true)
{
pos = text.indexOf(m_searchTerm, pos+1, Qt::CaseInsensitive);
@@ -338,6 +338,8 @@ CConsoleSCB::CConsoleSCB(QWidget* parent)
connect(findPreviousAction, &QAction::triggered, this, &CConsoleSCB::findPrevious);
ui->findPrevButton->addAction(findPreviousAction);
+ GetIEditor()->RegisterNotifyListener(this);
+
connect(ui->button, &QPushButton::clicked, this, &CConsoleSCB::showVariableEditor);
connect(ui->findButton, &QPushButton::clicked, this, &CConsoleSCB::toggleConsoleSearch);
connect(ui->textEdit, &ConsoleTextEdit::searchBarRequested, this, [this]
@@ -376,6 +378,8 @@ CConsoleSCB::~CConsoleSCB()
{
AzToolsFramework::EditorPreferencesNotificationBus::Handler::BusDisconnect();
+ GetIEditor()->UnregisterNotifyListener(this);
+
s_consoleSCB = nullptr;
CLogFile::AttachEditBox(nullptr);
}
@@ -567,7 +571,7 @@ static CVarBlock* VarBlockFromConsoleVars()
size_t cmdCount = console->GetSortedVars(&cmds[0], cmds.size());
CVarBlock* vb = new CVarBlock;
- IVariable* pVariable = 0;
+ IVariable* pVariable = nullptr;
for (int i = 0; i < cmdCount; i++)
{
ICVar* pCVar = console->GetCVar(cmds[i]);
@@ -1352,4 +1356,19 @@ CConsoleSCB* CConsoleSCB::GetCreatedInstance()
return s_consoleSCB;
}
+void CConsoleSCB::OnEditorNotifyEvent(EEditorNotifyEvent event)
+{
+ switch (event)
+ {
+ case eNotify_OnBeginGameMode:
+ if (gSettings.clearConsoleOnGameModeStart)
+ {
+ ui->textEdit->clear();
+ }
+ break;
+ default:
+ break;
+ }
+}
+
#include
diff --git a/Code/Editor/Controls/ConsoleSCB.h b/Code/Editor/Controls/ConsoleSCB.h
index 98bf4b391d..f51786e2a5 100644
--- a/Code/Editor/Controls/ConsoleSCB.h
+++ b/Code/Editor/Controls/ConsoleSCB.h
@@ -159,6 +159,7 @@ private:
class CConsoleSCB
: public QWidget
, private AzToolsFramework::EditorPreferencesNotificationBus::Handler
+ , public IEditorNotifyListener
{
Q_OBJECT
public:
@@ -187,6 +188,8 @@ private Q_SLOTS:
void findNext();
private:
+ void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
+
QScopedPointer ui;
int m_richEditTextLength;
diff --git a/Code/Editor/Controls/HotTrackingTreeCtrl.cpp b/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
index 917d02155b..54152a9fd4 100644
--- a/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
+++ b/Code/Editor/Controls/HotTrackingTreeCtrl.cpp
@@ -19,22 +19,22 @@ CHotTrackingTreeCtrl::CHotTrackingTreeCtrl(QWidget* parent)
: QTreeWidget(parent)
{
setMouseTracking(true);
- m_hHoverItem = NULL;
+ m_hHoverItem = nullptr;
}
void CHotTrackingTreeCtrl::mouseMoveEvent(QMouseEvent* event)
{
QTreeWidgetItem* hItem = itemAt(event->pos());
- if (m_hHoverItem != NULL)
+ if (m_hHoverItem != nullptr)
{
QFont font = m_hHoverItem->font(0);
font.setBold(false);
m_hHoverItem->setFont(0, font);
- m_hHoverItem = NULL;
+ m_hHoverItem = nullptr;
}
- if (hItem != NULL)
+ if (hItem != nullptr)
{
QFont font = hItem->font(0);
font.setBold(true);
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
index 323fe2a07a..8651db7e96 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertiesPanel.cpp
@@ -27,7 +27,7 @@ void ReflectedPropertiesPanel::DeleteVars()
{
ClearVarBlock();
m_updateCallbacks.clear();
- m_varBlock = 0;
+ m_varBlock = nullptr;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
index 89938d9735..1a7060aa8d 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyCtrl.cpp
@@ -198,7 +198,7 @@ void ReflectedPropertyControl::CreateItems(XmlNodeRef node)
void ReflectedPropertyControl::CreateItems(XmlNodeRef node, CVarBlockPtr& outBlockPtr, IVariable::OnSetCallback* func, bool splitCamelCaseIntoWords)
{
- SelectItem(0);
+ SelectItem(nullptr);
outBlockPtr = new CVarBlock;
for (size_t i = 0, iGroupCount(node->getChildCount()); i < iGroupCount; ++i)
@@ -505,7 +505,7 @@ void ReflectedPropertyControl::RemoveAllItems()
void ReflectedPropertyControl::ClearVarBlock()
{
RemoveAllItems();
- m_pVarBlock = 0;
+ m_pVarBlock = nullptr;
}
void ReflectedPropertyControl::RecreateAllItems()
@@ -688,11 +688,11 @@ void ReflectedPropertyControl::OnItemChange(ReflectedPropertyItem *item, bool de
// callback until after the current event queue is processed, so that we aren't changing other widgets
// as a ton of them are still being created.
Qt::ConnectionType connectionType = deferCallbacks ? Qt::QueuedConnection : Qt::DirectConnection;
- if (m_updateVarFunc != 0 && m_bEnableCallback)
+ if (m_updateVarFunc && m_bEnableCallback)
{
QMetaObject::invokeMethod(this, "DoUpdateCallback", connectionType, Q_ARG(IVariable*, item->GetVariable()));
}
- if (m_updateObjectFunc != 0 && m_bEnableCallback)
+ if (m_updateObjectFunc && m_bEnableCallback)
{
// KDAB: This callback has same signature as DoUpdateCallback. I think the only reason there are 2 is because some
// EntityObject registers callback and some derived objects want to register their own callback. the normal UpdateCallback
@@ -709,7 +709,7 @@ void ReflectedPropertyControl::DoUpdateCallback(IVariable *var)
const bool variableStillExists = FindVariable(var);
AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
- if (m_updateVarFunc == 0 || !variableStillExists)
+ if (!m_updateVarFunc || !variableStillExists)
{
return;
}
@@ -724,7 +724,7 @@ void ReflectedPropertyControl::DoUpdateObjectCallback(IVariable *var)
const bool variableStillExists = FindVariable(var);
AZ_Assert(variableStillExists, "This variable and the item containing it were destroyed during a deferred callback. Change to non-deferred callback.");
- if (m_updateVarFunc == 0 || !variableStillExists)
+ if ( !m_updateVarFunc || !variableStillExists)
{
return;
}
@@ -904,7 +904,7 @@ void ReflectedPropertyControl::SetUndoCallback(UndoCallback &callback)
void ReflectedPropertyControl::ClearUndoCallback()
{
- m_undoFunc = 0;
+ m_undoFunc = nullptr;
}
bool ReflectedPropertyControl::FindVariable(IVariable *categoryItem) const
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
index 0bea6902c9..5a9d61be42 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.cpp
@@ -82,7 +82,7 @@ public:
}
//helps implement ReflectedPropertyControl::ReplaceVarBlock
- void ReplaceVarBlock(CVarBlock *varBlock)
+ void ReplaceVarBlock(CVarBlock *varBlock) override
{
m_containerVar->Clear();
UpdateCommon(m_item->GetVariable(), varBlock);
@@ -207,7 +207,7 @@ void ReflectedPropertyItem::SetVariable(IVariable *var)
ReleaseVariable();
m_pVariable = pInputVar;
- assert(m_pVariable != NULL);
+ assert(m_pVariable != nullptr);
m_pVariable->AddOnSetCallback(&m_onSetCallback);
m_pVariable->AddOnSetEnumCallback(&m_onSetEnumCallback);
@@ -332,7 +332,7 @@ void ReflectedPropertyItem::RemoveAllChildren()
{
for (int i = 0; i < m_childs.size(); i++)
{
- m_childs[i]->m_parent = 0;
+ m_childs[i]->m_parent = nullptr;
}
m_childs.clear();
@@ -473,7 +473,7 @@ void ReflectedPropertyItem::ReleaseVariable()
m_pVariable->RemoveOnSetCallback(&m_onSetCallback);
m_pVariable->RemoveOnSetEnumCallback(&m_onSetEnumCallback);
}
- m_pVariable = 0;
+ m_pVariable = nullptr;
delete m_reflectedVarAdapter;
m_reflectedVarAdapter = nullptr;
}
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
index 0abf7d295c..9bd34f3f7c 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedPropertyItem.h
@@ -122,7 +122,7 @@ protected:
public:
//! Get number of child nodes.
- int GetChildCount() const { return m_childs.size(); };
+ int GetChildCount() const { return static_cast(m_childs.size()); };
//! Get Child by id.
ReflectedPropertyItem* GetChild(int index) const { return m_childs[index]; }
PropertyType GetType() const { return m_type; }
diff --git a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
index 20e86c6838..5639fa95b0 100644
--- a/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
+++ b/Code/Editor/Controls/ReflectedPropertyControl/ReflectedVarWrapper.cpp
@@ -473,7 +473,7 @@ void ReflectedVarUserAdapter::SyncReflectedVarToIVar(IVariable *pVariable)
//extract the list of custom items from the IVariable user data
IVariable::IGetCustomItems* pGetCustomItems = static_cast (pVariable->GetUserData().value());
- if (pGetCustomItems != 0)
+ if (pGetCustomItems != nullptr)
{
std::vector items;
QString dlgTitle;
diff --git a/Code/Editor/Controls/SplineCtrl.cpp b/Code/Editor/Controls/SplineCtrl.cpp
index 63481d27df..d66fc16ade 100644
--- a/Code/Editor/Controls/SplineCtrl.cpp
+++ b/Code/Editor/Controls/SplineCtrl.cpp
@@ -30,7 +30,7 @@ CSplineCtrl::CSplineCtrl(QWidget* parent)
m_nHitKeyIndex = -1;
m_nKeyDrawRadius = 3;
m_bTracking = false;
- m_pSpline = 0;
+ m_pSpline = nullptr;
m_gridX = 10;
m_gridY = 10;
m_fMinTime = -1;
@@ -40,7 +40,7 @@ CSplineCtrl::CSplineCtrl(QWidget* parent)
m_fTooltipScaleX = 1;
m_fTooltipScaleY = 1;
m_bLockFirstLastKey = false;
- m_pTimelineCtrl = 0;
+ m_pTimelineCtrl = nullptr;
m_bSelectedKeys.reserve(0);
@@ -417,7 +417,7 @@ void CSplineCtrl::SetActiveKey(int nIndex)
}
/////////////////////////////////////////////////////////////////////////////
-void CSplineCtrl::SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw)
+void CSplineCtrl::SetSpline(ISplineInterpolator* pSpline, bool bRedraw)
{
if (pSpline != m_pSpline)
{
@@ -596,7 +596,7 @@ CSplineCtrl::EHitCode CSplineCtrl::HitTest(const QPoint& point)
///////////////////////////////////////////////////////////////////////////////
void CSplineCtrl::StartTracking()
{
- m_bTracking = TRUE;
+ m_bTracking = true;
GetIEditor()->BeginUndo();
@@ -674,7 +674,7 @@ void CSplineCtrl::StopTracking()
GetIEditor()->AcceptUndo("Spline Move");
- m_bTracking = FALSE;
+ m_bTracking = false;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Controls/SplineCtrl.h b/Code/Editor/Controls/SplineCtrl.h
index e90fc1820e..ec5b3e52ce 100644
--- a/Code/Editor/Controls/SplineCtrl.h
+++ b/Code/Editor/Controls/SplineCtrl.h
@@ -59,7 +59,7 @@ public:
// Lock value of first and last key to be the same.
void LockFirstAndLastKeys(bool bLock) { m_bLockFirstLastKey = bLock; }
- void SetSpline(ISplineInterpolator* pSpline, BOOL bRedraw = FALSE);
+ void SetSpline(ISplineInterpolator* pSpline, bool bRedraw = false);
ISplineInterpolator* GetSpline();
void SetTimeMarker(float fTime);
diff --git a/Code/Editor/Controls/SplineCtrlEx.cpp b/Code/Editor/Controls/SplineCtrlEx.cpp
index 2afc3f16aa..36a9d8afef 100644
--- a/Code/Editor/Controls/SplineCtrlEx.cpp
+++ b/Code/Editor/Controls/SplineCtrlEx.cpp
@@ -69,8 +69,8 @@ protected:
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
m_splineEntries.resize(m_splineEntries.size() + 1);
SplineEntry& entry = m_splineEntries.back();
- ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
- entry.id = (pSplineSet ? pSplineSet->GetIDFromSpline(pSpline) : 0);
+ ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : nullptr);
+ entry.id = (pSplineSet ? pSplineSet->GetIDFromSpline(pSpline) : nullptr);
entry.pSpline = pSpline;
const int numKeys = pSpline->GetKeyCount();
@@ -81,10 +81,10 @@ protected:
}
}
- virtual int GetSize() { return sizeof(*this); }
- virtual QString GetDescription() { return "UndoSplineCtrlEx"; };
+ int GetSize() override { return sizeof(*this); }
+ QString GetDescription() override { return "UndoSplineCtrlEx"; };
- virtual void Undo(bool bUndo)
+ void Undo(bool bUndo) override
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
if (pCtrl)
@@ -104,7 +104,7 @@ protected:
}
}
- virtual void Redo()
+ void Redo() override
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
if (pCtrl)
@@ -134,7 +134,7 @@ private:
void SerializeSplines(_smart_ptr SplineEntry::* backup, bool bLoading)
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
- ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
+ ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : nullptr);
for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
{
SplineEntry& entry = *it;
@@ -157,19 +157,19 @@ private:
}
public:
- typedef std::list CSplineCtrls;
+ using CSplineCtrls = std::list;
static AbstractSplineWidget* FindControl(AbstractSplineWidget* pCtrl)
{
if (!pCtrl)
{
- return 0;
+ return nullptr;
}
auto iter = std::find(s_activeCtrls.begin(), s_activeCtrls.end(), pCtrl);
if (iter == s_activeCtrls.end())
{
- return 0;
+ return nullptr;
}
return *iter;
@@ -193,10 +193,10 @@ public:
static CSplineCtrls s_activeCtrls;
- virtual bool IsSelectionChanged() const
+ bool IsSelectionChanged() const override
{
AbstractSplineWidget* pCtrl = FindControl(m_pCtrl);
- ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : 0);
+ ISplineSet* pSplineSet = (pCtrl ? pCtrl->m_pSplineSet : nullptr);
for (auto it = m_splineEntries.begin(); it != m_splineEntries.end(); ++it)
{
@@ -256,11 +256,11 @@ SplineWidget::~SplineWidget()
AbstractSplineWidget::AbstractSplineWidget()
: m_defaultKeyTangentType(SPLINE_KEY_TANGENT_NONE)
{
- m_pTimelineCtrl = 0;
+ m_pTimelineCtrl = nullptr;
m_totalSplineCount = 0;
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
m_bHitIncomingHandle = true;
@@ -301,7 +301,7 @@ AbstractSplineWidget::AbstractSplineWidget()
m_boLeftMouseButtonDown = false;
- m_pSplineSet = 0;
+ m_pSplineSet = nullptr;
m_controlAmplitude = false;
@@ -1633,7 +1633,7 @@ void SplineWidget::wheelEvent(QWheelEvent* event)
void SplineWidget::keyPressEvent(QKeyEvent* e)
{
- BOOL bProcessed = false;
+ bool bProcessed = false;
switch (e->key())
{
@@ -1780,7 +1780,7 @@ void AbstractSplineWidget::SetHorizontalExtent([[maybe_unused]] int min, [[maybe
//si.nPage = max(0,m_rcClient.Width() - m_leftOffset*2);
//si.nPage = 1;
//si.nPage = 1;
- SetScrollInfo( SB_HORZ,&si,TRUE );
+ SetScrollInfo( SB_HORZ,&si,true );
*/
}
@@ -1792,7 +1792,7 @@ ISplineInterpolator* AbstractSplineWidget::HitSpline(const QPoint& point)
return m_pHitSpline;
}
- return NULL;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////////
@@ -1806,8 +1806,8 @@ AbstractSplineWidget::EHitCode AbstractSplineWidget::HitTest(const QPoint& point
PointToTimeValue(point, time, val);
m_hitCode = HIT_NOTHING;
- m_pHitSpline = NULL;
- m_pHitDetailSpline = NULL;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
m_bHitIncomingHandle = true;
@@ -1968,8 +1968,8 @@ void AbstractSplineWidget::StopTracking()
void AbstractSplineWidget::ScaleAmplitudeKeys(float time, float startValue, float offset)
{
//TODO: Test it in the facial animation pane and fix it...
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
@@ -2071,8 +2071,8 @@ void AbstractSplineWidget::TimeScaleKeys(float time, float startTime, float endT
float timeScaleC = endTime - startTime * timeScaleM;
// Loop through all keys that are selected.
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
float affectedRangeMin = FLT_MAX;
@@ -2179,8 +2179,8 @@ void AbstractSplineWidget::ValueScaleKeys(float startValue, float endValue)
}
// Loop through all keys that are selected.
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
@@ -2212,8 +2212,8 @@ void AbstractSplineWidget::ValueScaleKeys(float startValue, float endValue)
//////////////////////////////////////////////////////////////////////////
void AbstractSplineWidget::MoveSelectedKeys(Vec2 offset, bool copyKeys)
{
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
m_nHitDimension = -1;
@@ -2275,8 +2275,8 @@ void AbstractSplineWidget::RemoveKey(ISplineInterpolator* pSpline, int nKey)
SendNotifyEvent(SPLN_BEFORE_CHANGE);
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
if (nKey != -1)
{
@@ -2294,8 +2294,8 @@ void AbstractSplineWidget::RemoveSelectedKeys()
SendNotifyEvent(SPLN_BEFORE_CHANGE);
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
@@ -2558,11 +2558,11 @@ public:
};
void AbstractSplineWidget::DuplicateSelectedKeys()
{
- m_pHitSpline = 0;
- m_pHitDetailSpline = 0;
+ m_pHitSpline = nullptr;
+ m_pHitDetailSpline = nullptr;
m_nHitKeyIndex = -1;
- typedef std::vector KeysToAddContainer;
+ using KeysToAddContainer = std::vector;
KeysToAddContainer keysToInsert;
for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
{
@@ -2600,7 +2600,7 @@ void AbstractSplineWidget::ZeroAll()
{
GetIEditor()->BeginUndo();
- typedef std::vector SplineContainer;
+ using SplineContainer = std::vector;
SplineContainer splines;
for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
{
@@ -2632,7 +2632,7 @@ void AbstractSplineWidget::KeyAll()
{
GetIEditor()->BeginUndo();
- typedef std::vector SplineContainer;
+ using SplineContainer = std::vector;
SplineContainer splines;
for (int splineIndex = 0; splineIndex < int(m_splines.size()); ++splineIndex)
{
diff --git a/Code/Editor/Controls/TimelineCtrl.cpp b/Code/Editor/Controls/TimelineCtrl.cpp
index d1590c5346..a5a941fc78 100644
--- a/Code/Editor/Controls/TimelineCtrl.cpp
+++ b/Code/Editor/Controls/TimelineCtrl.cpp
@@ -58,7 +58,7 @@ TimelineWidget::TimelineWidget(QWidget* parent /* = nullptr */)
m_bIgnoreSetTime = false;
- m_pKeyTimeSet = 0;
+ m_pKeyTimeSet = nullptr;
m_markerStyle = MARKER_STYLE_SECONDS;
m_fps = 30.0f;
diff --git a/Code/Editor/Core/LevelEditorMenuHandler.cpp b/Code/Editor/Core/LevelEditorMenuHandler.cpp
index 3c27c25c9a..3724993604 100644
--- a/Code/Editor/Core/LevelEditorMenuHandler.cpp
+++ b/Code/Editor/Core/LevelEditorMenuHandler.cpp
@@ -80,12 +80,12 @@ namespace
, m_trigger(trigger)
{}
- virtual ~EditorListener()
+ ~EditorListener() override
{
GetIEditor()->UnregisterNotifyListener(this);
}
- void OnEditorNotifyEvent(EEditorNotifyEvent event)
+ void OnEditorNotifyEvent(EEditorNotifyEvent event) override
{
m_trigger(event);
}
@@ -544,12 +544,12 @@ void LevelEditorMenuHandler::PopulateEditMenu(ActionManager::MenuWrapper& editMe
auto snapMenu = modifyMenu.AddMenu(tr("Snap"));
- snapMenu.AddAction(ID_SNAPANGLE);
+ snapMenu.AddAction(AzToolsFramework::SnapAngle);
auto transformModeMenu = modifyMenu.AddMenu(tr("Transform Mode"));
- transformModeMenu.AddAction(ID_EDITMODE_MOVE);
- transformModeMenu.AddAction(ID_EDITMODE_ROTATE);
- transformModeMenu.AddAction(ID_EDITMODE_SCALE);
+ transformModeMenu.AddAction(AzToolsFramework::EditModeMove);
+ transformModeMenu.AddAction(AzToolsFramework::EditModeRotate);
+ transformModeMenu.AddAction(AzToolsFramework::EditModeScale);
editMenu.AddSeparator();
diff --git a/Code/Editor/Core/QtEditorApplication.cpp b/Code/Editor/Core/QtEditorApplication.cpp
index 5a4763d8e8..0776a96a4d 100644
--- a/Code/Editor/Core/QtEditorApplication.cpp
+++ b/Code/Editor/Core/QtEditorApplication.cpp
@@ -423,7 +423,7 @@ namespace Editor
{
UINT rawInputSize;
const UINT rawInputHeaderSize = sizeof(RAWINPUTHEADER);
- GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, NULL, &rawInputSize, rawInputHeaderSize);
+ GetRawInputData((HRAWINPUT)msg->lParam, RID_INPUT, nullptr, &rawInputSize, rawInputHeaderSize);
AZStd::array rawInputBytesArray;
LPBYTE rawInputBytes = rawInputBytesArray.data();
diff --git a/Code/Editor/Core/Tests/test_Main.cpp b/Code/Editor/Core/Tests/test_Main.cpp
index c0772753c6..6acedb6e57 100644
--- a/Code/Editor/Core/Tests/test_Main.cpp
+++ b/Code/Editor/Core/Tests/test_Main.cpp
@@ -26,7 +26,7 @@ class EditorCoreTestEnvironment
public:
AZ_TEST_CLASS_ALLOCATOR(EditorCoreTestEnvironment);
- virtual ~EditorCoreTestEnvironment()
+ ~EditorCoreTestEnvironment() override
{
}
diff --git a/Code/Editor/CryEdit.cpp b/Code/Editor/CryEdit.cpp
index 96836c9f1e..417305a4bb 100644
--- a/Code/Editor/CryEdit.cpp
+++ b/Code/Editor/CryEdit.cpp
@@ -375,9 +375,6 @@ void CCryEditApp::RegisterActionHandlers()
});
ON_COMMAND(ID_MOVE_OBJECT, OnMoveObject)
ON_COMMAND(ID_RENAME_OBJ, OnRenameObj)
- ON_COMMAND(ID_EDITMODE_MOVE, OnEditmodeMove)
- ON_COMMAND(ID_EDITMODE_ROTATE, OnEditmodeRotate)
- ON_COMMAND(ID_EDITMODE_SCALE, OnEditmodeScale)
ON_COMMAND(ID_UNDO, OnUndo)
ON_COMMAND(ID_TOOLBAR_WIDGET_REDO, OnUndo) // Can't use the same ID, because for the menu we can't have a QWidgetAction, while for the toolbar we want one
ON_COMMAND(ID_IMPORT_ASSET, OnOpenAssetImporter)
@@ -2579,75 +2576,6 @@ void CCryEditApp::OnRenameObj()
{
}
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeMove()
-{
- using namespace AzToolsFramework;
- EditorTransformComponentSelectionRequestBus::Event(
- GetEntityContextId(),
- &EditorTransformComponentSelectionRequests::SetTransformMode,
- EditorTransformComponentSelectionRequests::Mode::Translation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeRotate()
-{
- using namespace AzToolsFramework;
- EditorTransformComponentSelectionRequestBus::Event(
- GetEntityContextId(),
- &EditorTransformComponentSelectionRequests::SetTransformMode,
- EditorTransformComponentSelectionRequests::Mode::Rotation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnEditmodeScale()
-{
- using namespace AzToolsFramework;
- EditorTransformComponentSelectionRequestBus::Event(
- GetEntityContextId(),
- &EditorTransformComponentSelectionRequests::SetTransformMode,
- EditorTransformComponentSelectionRequests::Mode::Scale);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeMove(QAction* action)
-{
- Q_ASSERT(action->isCheckable());
-
- AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
- AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
- mode, AzToolsFramework::GetEntityContextId(),
- &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
- action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Translation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeRotate(QAction* action)
-{
- Q_ASSERT(action->isCheckable());
-
- AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
- AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
- mode, AzToolsFramework::GetEntityContextId(),
- &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
- action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Rotation);
-}
-
-//////////////////////////////////////////////////////////////////////////
-void CCryEditApp::OnUpdateEditmodeScale(QAction* action)
-{
- Q_ASSERT(action->isCheckable());
-
- AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
- AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
- mode, AzToolsFramework::GetEntityContextId(),
- &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
-
- action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale);
-}
-
void CCryEditApp::OnViewSwitchToGame()
{
if (IsInPreviewMode())
@@ -2901,7 +2829,14 @@ void CCryEditApp::OpenProjectManager(const AZStd::string& screen)
{
// provide the current project path for in case we want to update the project
AZ::IO::FixedMaxPathString projectPath = AZ::Utils::GetProjectPath();
- const AZStd::string commandLineOptions = AZStd::string::format(" --screen %s --project-path %s", screen.c_str(), projectPath.c_str());
+#if !AZ_TRAIT_OS_PLATFORM_APPLE && !AZ_TRAIT_OS_USE_WINDOWS_FILE_PATHS
+ const char* argumentQuoteString = R"(")";
+#else
+ const char* argumentQuoteString = R"(\")";
+#endif
+ const AZStd::string commandLineOptions = AZStd::string::format(R"( --screen %s --project-path %s%s%s)",
+ screen.c_str(),
+ argumentQuoteString, projectPath.c_str(), argumentQuoteString);
bool launchSuccess = AzFramework::ProjectManager::LaunchProjectManager(commandLineOptions);
if (!launchSuccess)
{
diff --git a/Code/Editor/CryEdit.h b/Code/Editor/CryEdit.h
index af0fbb0971..9406b37ea2 100644
--- a/Code/Editor/CryEdit.h
+++ b/Code/Editor/CryEdit.h
@@ -208,12 +208,6 @@ public:
void DeleteSelectedEntities(bool includeDescendants);
void OnMoveObject();
void OnRenameObj();
- void OnEditmodeMove();
- void OnEditmodeRotate();
- void OnEditmodeScale();
- void OnUpdateEditmodeMove(QAction* action);
- void OnUpdateEditmodeRotate(QAction* action);
- void OnUpdateEditmodeScale(QAction* action);
void OnUndo();
void OnOpenAssetImporter();
void OnUpdateSelected(QAction* action);
diff --git a/Code/Editor/CryEditDoc.cpp b/Code/Editor/CryEditDoc.cpp
index feafeec4f5..56b617969e 100644
--- a/Code/Editor/CryEditDoc.cpp
+++ b/Code/Editor/CryEditDoc.cpp
@@ -110,21 +110,12 @@ namespace Internal
// CCryEditDoc construction/destruction
CCryEditDoc::CCryEditDoc()
- : doc_validate_surface_types(0)
+ : doc_validate_surface_types(nullptr)
, m_modifiedModuleFlags(eModifiedNothing)
- // It assumes loaded levels have already been exported. Can be a big fat lie, though.
- // The right way would require us to save to the level folder the export status of the
- // level.
- , m_boLevelExported(true)
- , m_modified(false)
- , m_envProbeHeight(200.0f)
- , m_envProbeSliceRelativePath("EngineAssets/Slices/DefaultLevelSetup.slice")
{
////////////////////////////////////////////////////////////////////////
// Set member variables to initial values
////////////////////////////////////////////////////////////////////////
- m_bLoadFailed = false;
- m_waterColor = QColor(0, 0, 255);
m_fogTemplate = GetIEditor()->FindTemplate("Fog");
m_environmentTemplate = GetIEditor()->FindTemplate("Environment");
@@ -138,7 +129,6 @@ CCryEditDoc::CCryEditDoc()
m_environmentTemplate = XmlHelpers::CreateXmlNode("Environment");
}
- m_bDocumentReady = false;
GetIEditor()->SetDocument(this);
CLogFile::WriteLine("Document created");
RegisterConsoleVariables();
@@ -197,7 +187,7 @@ CCryEditDoc::DocumentEditingMode CCryEditDoc::GetEditMode() const
QString CCryEditDoc::GetActivePathName() const
{
- return DocumentEditingMode() == CCryEditDoc::DocumentEditingMode::SliceEdit ? GetSlicePathName() : GetLevelPathName();
+ return GetEditMode() == CCryEditDoc::DocumentEditingMode::SliceEdit ? GetSlicePathName() : GetLevelPathName();
}
QString CCryEditDoc::GetTitle() const
@@ -262,9 +252,9 @@ void CCryEditDoc::DeleteContents()
GetIEditor()->FlushUndo();
// Notify listeners.
- for (std::list::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+ for (IDocListener* listener : m_listeners)
{
- (*it)->OnCloseDocument();
+ listener->OnCloseDocument();
}
GetIEditor()->ResetViews();
@@ -460,7 +450,7 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
//////////////////////////////////////////////////////////////////////////
// Load water color.
//////////////////////////////////////////////////////////////////////////
- (*arrXmlAr[DMAS_GENERAL]).root->getAttr("WaterColor", m_waterColor);
+ (*arrXmlAr[DMAS_GENERAL]).root->getAttr("WaterColor", m_waterColor);
//////////////////////////////////////////////////////////////////////////
// Load View Settings
@@ -509,9 +499,9 @@ void CCryEditDoc::Load(TDocMultiArchive& arrXmlAr, const QString& szFilename)
CAutoLogTime logtime("Post Load");
// Notify listeners.
- for (std::list::iterator it = m_listeners.begin(); it != m_listeners.end(); ++it)
+ for (IDocListener* listener : m_listeners)
{
- (*it)->OnLoadDocument();
+ listener->OnLoadDocument();
}
}
@@ -710,7 +700,8 @@ bool CCryEditDoc::SaveModified()
return true;
}
- auto button = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), tr("Save changes to %1?").arg(GetTitle()), QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
+ auto button = QMessageBox::question(AzToolsFramework::GetActiveWindow(), QString(), tr("Save changes to %1?").arg(GetTitle()),
+ QMessageBox::Yes | QMessageBox::No | QMessageBox::Cancel);
switch (button)
{
case QMessageBox::Cancel:
@@ -935,8 +926,7 @@ bool CCryEditDoc::OnSaveDocument(const QString& lpszPathName)
}
TSaveDocContext context;
- if (shouldSaveLevel &&
- BeforeSaveDocument(lpszPathName, context))
+ if (shouldSaveLevel && BeforeSaveDocument(lpszPathName, context))
{
DoSaveDocument(lpszPathName, context);
saveSuccess = AfterSaveDocument(lpszPathName, context);
@@ -974,7 +964,7 @@ bool CCryEditDoc::BeforeSaveDocument(const QString& lpszPathName, TSaveDocContex
return TRUE;
}
-bool CCryEditDoc::HasLayerNameConflicts()
+bool CCryEditDoc::HasLayerNameConflicts() const
{
AZStd::vector editorEntities;
AzToolsFramework::EditorEntityContextRequestBus::Broadcast(
@@ -1006,43 +996,42 @@ bool CCryEditDoc::HasLayerNameConflicts()
bool CCryEditDoc::DoSaveDocument(const QString& filename, TSaveDocContext& context)
{
bool& bSaved = context.bSaved;
- if (bSaved)
+ if (!bSaved)
{
- // Paranoia - we shouldn't get this far into the save routine without a level loaded (empty levelPath)
- // If nothing is loaded, we don't need to save anything
- if (filename.isEmpty())
- {
- bSaved = false;
- }
- else
- {
- // Save Tag Point locations to file if auto save of tag points disabled
- if (!gSettings.bAutoSaveTagPoints)
- {
- CCryEditApp::instance()->SaveTagLocations();
- }
-
- QString normalizedPath = Path::ToUnixPath(filename);
- if (IsSliceFile(normalizedPath))
- {
- bSaved = SaveSlice(normalizedPath);
- }
- else
- {
- bSaved = SaveLevel(normalizedPath);
- }
-
- // Changes filename for this document.
- SetPathName(normalizedPath);
- }
+ return false;
+ }
+ // Paranoia - we shouldn't get this far into the save routine without a level loaded (empty levelPath)
+ // If nothing is loaded, we don't need to save anything
+ if (filename.isEmpty())
+ {
+ bSaved = false;
+ return false;
}
+ // Save Tag Point locations to file if auto save of tag points disabled
+ if (!gSettings.bAutoSaveTagPoints)
+ {
+ CCryEditApp::instance()->SaveTagLocations();
+ }
+
+ QString normalizedPath = Path::ToUnixPath(filename);
+ if (IsSliceFile(normalizedPath))
+ {
+ bSaved = SaveSlice(normalizedPath);
+ }
+ else
+ {
+ bSaved = SaveLevel(normalizedPath);
+ }
+
+ // Changes filename for this document.
+ SetPathName(normalizedPath);
return bSaved;
}
bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt)
{
- bool& bSaved = context.bSaved;
+ bool bSaved = context.bSaved;
GetIEditor()->Notify(eNotify_OnEndSceneSave);
@@ -1069,8 +1058,7 @@ bool CCryEditDoc::AfterSaveDocument([[maybe_unused]] const QString& lpszPathName
static void GetUserSettingsFile(const QString& levelFolder, QString& userSettings)
{
const char* pUserName = GetISystem()->GetUserName();
- QString fileName;
- fileName = QStringLiteral("%1_usersettings.editor_xml").arg(pUserName);
+ QString fileName = QStringLiteral("%1_usersettings.editor_xml").arg(pUserName);
userSettings = Path::Make(levelFolder, fileName);
}
@@ -1184,9 +1172,9 @@ bool CCryEditDoc::SaveLevel(const QString& filename)
}
QString oldFilePath = QDir(oldLevelFolder).absoluteFilePath(sourceName);
- QString newFilePath = QDir(newLevelFolder).absoluteFilePath(sourceName);
+ QString newFilePath = QDir(newLevelFolder).absoluteFilePath(destName);
CFileUtil::CopyFile(oldFilePath, newFilePath);
- } while (findHandle = pIPak->FindNext(findHandle));
+ } while ((findHandle = pIPak->FindNext(findHandle)));
pIPak->FindClose(findHandle);
}
@@ -1508,7 +1496,7 @@ bool CCryEditDoc::LoadEntitiesFromLevel(const QString& levelPakFile)
{
AZStd::vector fileBuffer;
fileBuffer.resize(entitiesFile.GetLength());
- if (fileBuffer.size() > 0)
+ if (!fileBuffer.empty())
{
if (fileBuffer.size() == entitiesFile.ReadRaw(fileBuffer.begin(), fileBuffer.size()))
{
@@ -1912,7 +1900,7 @@ void CCryEditDoc::UnregisterListener(IDocListener* listener)
m_listeners.remove(listener);
}
-void CCryEditDoc::LogLoadTime(int time)
+void CCryEditDoc::LogLoadTime(int time) const
{
QString appFilePath = QDir::toNativeSeparators(QCoreApplication::applicationFilePath());
QString exePath = Path::GetPath(appFilePath);
@@ -1924,21 +1912,18 @@ void CCryEditDoc::LogLoadTime(int time)
SetFileAttributes(filename.toUtf8().data(), FILE_ATTRIBUTE_ARCHIVE);
#endif
- FILE* file = nullptr;
- azfopen(&file, filename.toUtf8().data(), "at");
-
- if (file)
+ QFile file(filename);
+ if (!file.open(QFile::Append | QFile::Text))
{
- char version[50];
- GetIEditor()->GetFileVersion().ToShortString(version, AZ_ARRAY_SIZE(version));
-
- QString text;
-
- time = time / 1000;
- text = QStringLiteral("\n[%1] Level %2 loaded in %3 seconds").arg(version, level).arg(time);
- fwrite(text.toUtf8().data(), text.toUtf8().length(), 1, file);
- fclose(file);
+ return;
}
+
+ char version[50];
+ GetIEditor()->GetFileVersion().ToShortString(version, AZ_ARRAY_SIZE(version));
+
+ time = time / 1000;
+ QString text = QStringLiteral("\n[%1] Level %2 loaded in %3 seconds").arg(version, level).arg(time);
+ file.write(text.toUtf8());
}
void CCryEditDoc::SetDocumentReady(bool bReady)
@@ -1946,7 +1931,7 @@ void CCryEditDoc::SetDocumentReady(bool bReady)
m_bDocumentReady = bReady;
}
-void CCryEditDoc::GetMemoryUsage(ICrySizer* pSizer)
+void CCryEditDoc::GetMemoryUsage(ICrySizer* pSizer) const
{
{
SIZER_COMPONENT_NAME(pSizer, "UndoManager(estimate)");
@@ -2070,12 +2055,9 @@ void CCryEditDoc::InitEmptyLevel(int /*resolution*/, int /*unitSize*/, bool /*bU
{
// Notify listeners.
std::list listeners = m_listeners;
- std::list::iterator it, next;
- for (it = listeners.begin(); it != listeners.end(); it = next)
+ for (IDocListener* listener : listeners)
{
- next = it;
- next++;
- (*it)->OnNewDocument();
+ listener->OnNewDocument();
}
}
@@ -2136,25 +2118,23 @@ void CCryEditDoc::OnEnvironmentPropertyChanged(IVariable* pVar)
{
return;
}
+ QString childValue;
if (pVar->GetDataType() == IVariable::DT_COLOR)
{
Vec3 value;
pVar->Get(value);
- QString buff;
QColor gammaColor = ColorLinearToGamma(ColorF(value.x, value.y, value.z));
- buff = QStringLiteral("%1,%2,%3").arg(gammaColor.red()).arg(gammaColor.green()).arg(gammaColor.blue());
- childNode->setAttr("value", buff.toUtf8().data());
+ childValue = QStringLiteral("%1,%2,%3").arg(gammaColor.red()).arg(gammaColor.green()).arg(gammaColor.blue());
}
else
{
- QString value;
- pVar->Get(value);
- childNode->setAttr("value", value.toUtf8().data());
+ pVar->Get(childValue);
}
+ childNode->setAttr("value", childValue.toUtf8().data());
}
-QString CCryEditDoc::GetCryIndexPath(const LPCTSTR levelFilePath)
+QString CCryEditDoc::GetCryIndexPath(const LPCTSTR levelFilePath) const
{
QString levelPath = Path::GetPath(levelFilePath);
QString levelName = Path::GetFileName(levelFilePath);
@@ -2185,8 +2165,7 @@ BOOL CCryEditDoc::LoadXmlArchiveArray(TDocMultiArchive& arrXmlAr, const QString&
}
CPakFile pakFile;
- bool loadFromPakSuccess;
- loadFromPakSuccess = xmlAr.LoadFromPak(levelPath, pakFile);
+ bool loadFromPakSuccess = xmlAr.LoadFromPak(levelPath, pakFile);
pIPak->ClosePack(absoluteLevelPath.toUtf8().data());
if (!loadFromPakSuccess)
{
diff --git a/Code/Editor/CryEditDoc.h b/Code/Editor/CryEditDoc.h
index 574f8eb7da..d32e8e5bb1 100644
--- a/Code/Editor/CryEditDoc.h
+++ b/Code/Editor/CryEditDoc.h
@@ -91,7 +91,7 @@ public: // Create from serialization only
// ClassWizard generated virtual function overrides
virtual bool OnOpenDocument(const QString& lpszPathName);
- const bool IsLevelLoadFailed() const { return m_bLoadFailed; }
+ bool IsLevelLoadFailed() const { return m_bLoadFailed; }
//! Marks this document as having errors.
void SetHasErrors() { m_hasErrors = true; }
@@ -121,7 +121,7 @@ public: // Create from serialization only
CClouds* GetClouds() { return m_pClouds; }
void SetWaterColor(const QColor& col) { m_waterColor = col; }
- QColor GetWaterColor() { return m_waterColor; }
+ QColor GetWaterColor() const { return m_waterColor; }
XmlNodeRef& GetFogTemplate() { return m_fogTemplate; }
XmlNodeRef& GetEnvironmentTemplate() { return m_environmentTemplate; }
void OnEnvironmentPropertyChanged(IVariable* pVar);
@@ -129,7 +129,7 @@ public: // Create from serialization only
void RegisterListener(IDocListener* listener);
void UnregisterListener(IDocListener* listener);
- void GetMemoryUsage(ICrySizer* pSizer);
+ void GetMemoryUsage(ICrySizer* pSizer) const;
static bool IsBackupOrTempLevelSubdirectory(const QString& folderName);
protected:
@@ -161,14 +161,14 @@ protected:
void SerializeFogSettings(CXmlArchive& xmlAr);
virtual void SerializeViewSettings(CXmlArchive& xmlAr);
void SerializeNameSelection(CXmlArchive& xmlAr);
- void LogLoadTime(int time);
+ void LogLoadTime(int time) const;
struct TSaveDocContext
{
bool bSaved;
};
bool BeforeSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
- bool HasLayerNameConflicts();
+ bool HasLayerNameConflicts() const;
bool DoSaveDocument(const QString& lpszPathName, TSaveDocContext& context);
bool AfterSaveDocument(const QString& lpszPathName, TSaveDocContext& context, bool bShowPrompt = true);
@@ -180,7 +180,7 @@ protected:
void OnStartLevelResourceList();
static void OnValidateSurfaceTypesChanged(ICVar*);
- QString GetCryIndexPath(const LPCTSTR levelFilePath);
+ QString GetCryIndexPath(const LPCTSTR levelFilePath) const;
//////////////////////////////////////////////////////////////////////////
// SliceEditorEntityOwnershipServiceNotificationBus::Handler
@@ -188,24 +188,26 @@ protected:
void OnSliceInstantiationFailed(const AZ::Data::AssetId& sliceAssetId, const AzFramework::SliceInstantiationTicket& /*ticket*/) override;
//////////////////////////////////////////////////////////////////////////
- bool m_bLoadFailed;
- QColor m_waterColor;
+ bool m_bLoadFailed = false;
+ QColor m_waterColor = QColor(0, 0, 255);
XmlNodeRef m_fogTemplate;
XmlNodeRef m_environmentTemplate;
CClouds* m_pClouds;
std::list m_listeners;
- bool m_bDocumentReady;
- ICVar* doc_validate_surface_types;
+ bool m_bDocumentReady = false;
+ ICVar* doc_validate_surface_types = nullptr;
int m_modifiedModuleFlags;
- bool m_boLevelExported;
- bool m_modified;
+ // On construction, it assumes loaded levels have already been exported. Can be a big fat lie, though.
+ // The right way would require us to save to the level folder the export status of the level.
+ bool m_boLevelExported = true;
+ bool m_modified = false;
QString m_pathName;
QString m_slicePathName;
QString m_title;
AZ::Data::AssetId m_envProbeSliceAssetId;
float m_terrainSize;
- const char* m_envProbeSliceRelativePath;
- const float m_envProbeHeight;
+ const char* m_envProbeSliceRelativePath = "EngineAssets/Slices/DefaultLevelSetup.slice";
+ const float m_envProbeHeight = 200.0f;
bool m_hasErrors = false; ///< This is used to warn the user that they may lose work when they go to save.
};
diff --git a/Code/Editor/Dialogs/ErrorsDlg.cpp b/Code/Editor/Dialogs/ErrorsDlg.cpp
index e89a3a6ded..280ffbbab6 100644
--- a/Code/Editor/Dialogs/ErrorsDlg.cpp
+++ b/Code/Editor/Dialogs/ErrorsDlg.cpp
@@ -20,7 +20,7 @@ AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
-CErrorsDlg::CErrorsDlg(QWidget* pParent /*=NULL*/)
+CErrorsDlg::CErrorsDlg(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, ui(new Ui::CErrorsDlg)
{
diff --git a/Code/Editor/Dialogs/PythonScriptsDialog.cpp b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
index 98365769bb..7c6b445387 100644
--- a/Code/Editor/Dialogs/PythonScriptsDialog.cpp
+++ b/Code/Editor/Dialogs/PythonScriptsDialog.cpp
@@ -159,7 +159,7 @@ void CPythonScriptsDialog::OnExecute()
QList selectedItems = ui->treeView->GetSelectedItems();
QStandardItem* selectedItem = selectedItems.empty() ? nullptr : selectedItems.first();
- if (selectedItem == NULL)
+ if (selectedItem == nullptr)
{
return;
}
diff --git a/Code/Editor/EditorPreferencesPageGeneral.cpp b/Code/Editor/EditorPreferencesPageGeneral.cpp
index 70ac0fd46f..79ecfbdfc7 100644
--- a/Code/Editor/EditorPreferencesPageGeneral.cpp
+++ b/Code/Editor/EditorPreferencesPageGeneral.cpp
@@ -32,6 +32,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
->Field("PreviewPanel", &GeneralSettings::m_previewPanel)
->Field("ApplyConfigSpec", &GeneralSettings::m_applyConfigSpec)
->Field("EnableSourceControl", &GeneralSettings::m_enableSourceControl)
+ ->Field("ClearConsole", &GeneralSettings::m_clearConsoleOnGameModeStart)
->Field("ConsoleBackgroundColorTheme", &GeneralSettings::m_consoleBackgroundColorTheme)
->Field("AutoloadLastLevel", &GeneralSettings::m_autoLoadLastLevel)
->Field("ShowTimeInConsole", &GeneralSettings::m_bShowTimeInConsole)
@@ -77,6 +78,8 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_previewPanel, "Show Geometry Preview Panel", "Show Geometry Preview Panel")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_applyConfigSpec, "Hide objects by config spec", "Hide objects by config spec")
->DataElement(AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_enableSourceControl, "Enable Source Control", "Enable Source Control")
+ ->DataElement(
+ AZ::Edit::UIHandlers::CheckBox, &GeneralSettings::m_clearConsoleOnGameModeStart, "Clear Console at game startup", "Clear Console when game mode starts")
->DataElement(AZ::Edit::UIHandlers::ComboBox, &GeneralSettings::m_consoleBackgroundColorTheme, "Console Background", "Console Background")
->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Light, "Light")
->EnumAttribute(AzToolsFramework::ConsoleColorTheme::Dark, "Dark")
@@ -142,6 +145,7 @@ void CEditorPreferencesPage_General::OnApply()
gSettings.bPreviewGeometryWindow = m_generalSettings.m_previewPanel;
gSettings.bApplyConfigSpecInEditor = m_generalSettings.m_applyConfigSpec;
gSettings.enableSourceControl = m_generalSettings.m_enableSourceControl;
+ gSettings.clearConsoleOnGameModeStart = m_generalSettings.m_clearConsoleOnGameModeStart;
gSettings.consoleBackgroundColorTheme = m_generalSettings.m_consoleBackgroundColorTheme;
gSettings.bShowTimeInConsole = m_generalSettings.m_bShowTimeInConsole;
gSettings.bShowDashboardAtStartup = m_messaging.m_showDashboard;
@@ -176,6 +180,7 @@ void CEditorPreferencesPage_General::InitializeSettings()
m_generalSettings.m_previewPanel = gSettings.bPreviewGeometryWindow;
m_generalSettings.m_applyConfigSpec = gSettings.bApplyConfigSpecInEditor;
m_generalSettings.m_enableSourceControl = gSettings.enableSourceControl;
+ m_generalSettings.m_clearConsoleOnGameModeStart = gSettings.clearConsoleOnGameModeStart;
m_generalSettings.m_consoleBackgroundColorTheme = gSettings.consoleBackgroundColorTheme;
m_generalSettings.m_bShowTimeInConsole = gSettings.bShowTimeInConsole;
m_generalSettings.m_autoLoadLastLevel = gSettings.bAutoloadLastLevelAtStartup;
diff --git a/Code/Editor/EditorPreferencesPageGeneral.h b/Code/Editor/EditorPreferencesPageGeneral.h
index f22cfdd424..9a3a0f21e8 100644
--- a/Code/Editor/EditorPreferencesPageGeneral.h
+++ b/Code/Editor/EditorPreferencesPageGeneral.h
@@ -46,6 +46,7 @@ private:
bool m_previewPanel;
bool m_applyConfigSpec;
bool m_enableSourceControl;
+ bool m_clearConsoleOnGameModeStart;
AzToolsFramework::ConsoleColorTheme m_consoleBackgroundColorTheme;
bool m_autoLoadLastLevel;
bool m_bShowTimeInConsole;
diff --git a/Code/Editor/EditorViewportWidget.cpp b/Code/Editor/EditorViewportWidget.cpp
index 26c96f54b1..dd89d96dc3 100644
--- a/Code/Editor/EditorViewportWidget.cpp
+++ b/Code/Editor/EditorViewportWidget.cpp
@@ -1040,6 +1040,13 @@ AZStd::shared_ptr CreateMod
AzFramework::ViewportId viewportId)
{
auto controller = AZStd::make_shared();
+
+ controller->SetCameraPriorityBuilderCallback(
+ [](AtomToolsFramework::CameraControllerPriorityFn& cameraControllerPriorityFn)
+ {
+ cameraControllerPriorityFn = AtomToolsFramework::DefaultCameraControllerPriority;
+ });
+
controller->SetCameraPropsBuilderCallback(
[](AzFramework::CameraProps& cameraProps)
{
diff --git a/Code/Editor/ErrorReport.h b/Code/Editor/ErrorReport.h
index dec5cd4fb8..2bef4105f8 100644
--- a/Code/Editor/ErrorReport.h
+++ b/Code/Editor/ErrorReport.h
@@ -105,7 +105,7 @@ public:
bool IsEmpty() const;
//! Get number of contained error records.
- int GetErrorCount() const { return m_errors.size(); };
+ int GetErrorCount() const { return static_cast(m_errors.size()); };
//! Get access to indexed error record.
CErrorRecord& GetError(int i);
//! Clear all error records.
diff --git a/Code/Editor/Export/ExportManager.cpp b/Code/Editor/Export/ExportManager.cpp
index 54f3c2f723..764cc7b6b3 100644
--- a/Code/Editor/Export/ExportManager.cpp
+++ b/Code/Editor/Export/ExportManager.cpp
@@ -95,7 +95,7 @@ Export::CObject::CObject(const char* pName)
cameraTargetNodeName[0] = '\0';
- m_pLastObject = 0;
+ m_pLastObject = nullptr;
}
@@ -115,14 +115,14 @@ void Export::CData::Clear()
// CExportManager
CExportManager::CExportManager()
: m_isPrecaching(false)
- , m_pBaseObj(0)
+ , m_pBaseObj(nullptr)
, m_FBXBakedExportFPS(0.0f)
, m_fScale(100.0f)
, // this scale is used by CryEngine RC
m_bAnimationExport(false)
, m_bExportLocalCoords(false)
, m_numberOfExportFrames(0)
- , m_pivotEntityObject(0)
+ , m_pivotEntityObject(nullptr)
, m_bBakedKeysSequenceExport(true)
, m_animTimeExportPrimarySequenceCurrentTime(0.0f)
, m_animKeyTimeExport(true)
@@ -289,7 +289,7 @@ void CExportManager::ProcessEntityAnimationTrack(
const AZ::EntityId entityId, Export::CObject* pObj, AnimParamType entityTrackParamType)
{
CTrackViewAnimNode* pEntityNode = GetIEditor()->GetSequenceManager()->GetActiveAnimNode(entityId);
- CTrackViewTrack* pEntityTrack = (pEntityNode ? pEntityNode->GetTrackForParameter(entityTrackParamType) : 0);
+ CTrackViewTrack* pEntityTrack = (pEntityNode ? pEntityNode->GetTrackForParameter(entityTrackParamType) : nullptr);
if (!pEntityTrack)
{
@@ -396,7 +396,7 @@ void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh
else
{
Export::CMesh* pMesh = new Export::CMesh();
- if (meshDesc.m_nFaceCount == 0 && meshDesc.m_nIndexCount != 0 && meshDesc.m_pIndices != 0)
+ if (meshDesc.m_nFaceCount == 0 && meshDesc.m_nIndexCount != 0 && meshDesc.m_pIndices != nullptr)
{
const vtx_idx* pIndices = &meshDesc.m_pIndices[0];
int nTris = meshDesc.m_nIndexCount / 3;
@@ -430,7 +430,7 @@ void CExportManager::AddMesh(Export::CObject* pObj, const IIndexedMesh* pIndMesh
bool CExportManager::AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matrix34A* pTm)
{
- IIndexedMesh* pIndMesh = 0;
+ IIndexedMesh* pIndMesh = nullptr;
if (pStatObj->GetSubObjectCount())
{
@@ -439,7 +439,7 @@ bool CExportManager::AddStatObj(Export::CObject* pObj, IStatObj* pStatObj, Matri
IStatObj::SSubObject* pSubObj = pStatObj->GetSubObject(i);
if (pSubObj && pSubObj->nType == STATIC_SUB_OBJECT_MESH && pSubObj->pStatObj)
{
- pIndMesh = 0;
+ pIndMesh = nullptr;
if (m_isOccluder)
{
if (pSubObj->pStatObj->GetLodObject(2))
@@ -541,7 +541,7 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
if (m_isPrecaching)
{
- AddMeshes(0);
+ AddMeshes(nullptr);
return true;
}
@@ -553,7 +553,7 @@ bool CExportManager::AddObject(CBaseObject* pBaseObj)
m_objectMap[pBaseObj] = int(m_data.m_objects.size() - 1);
AddMeshes(pObj);
- m_pBaseObj = 0;
+ m_pBaseObj = nullptr;
return true;
}
@@ -671,7 +671,7 @@ bool CExportManager::ProcessObjectsForExport()
for (size_t objectID = 0; objectID < m_data.m_objects.size(); ++objectID)
{
Export::CObject* pObj2 = m_data.m_objects[objectID];
- CBaseObject* pObject = 0;
+ CBaseObject* pObject = nullptr;
if (QString::compare(pObj2->name, kPrimaryCameraName) == 0)
{
@@ -976,7 +976,7 @@ bool CExportManager::AddObjectsFromSequence(CTrackViewSequence* pSequence, XmlNo
{
if (pSubSequence && !pSubSequence->IsDisabled())
{
- XmlNodeRef subSeqNode = 0;
+ XmlNodeRef subSeqNode = nullptr;
if (!seqNode)
{
diff --git a/Code/Editor/Export/OBJExporter.cpp b/Code/Editor/Export/OBJExporter.cpp
index 893512e236..bd2696090e 100644
--- a/Code/Editor/Export/OBJExporter.cpp
+++ b/Code/Editor/Export/OBJExporter.cpp
@@ -67,7 +67,7 @@ bool COBJExporter::ExportToFile(const char* filename, const Export::IData* pExpo
while (nParent >= 0 && nParent < pExportData->GetObjectCount())
{
const Export::Object* pParentObj = pExportData->GetObject(nParent);
- assert(NULL != pParentObj);
+ assert(nullptr != pParentObj);
Vec3 pos2(pParentObj->pos.x, pParentObj->pos.y, pParentObj->pos.z);
Quat rot2(pParentObj->rot.w, pParentObj->rot.v.x, pParentObj->rot.v.y, pParentObj->rot.v.z);
diff --git a/Code/Editor/GameEngine.cpp b/Code/Editor/GameEngine.cpp
index bb0b1d4547..23966c1049 100644
--- a/Code/Editor/GameEngine.cpp
+++ b/Code/Editor/GameEngine.cpp
@@ -566,7 +566,7 @@ void CGameEngine::SwitchToInGame()
streamer->QueueRequest(flush);
wait.acquire();
}
-
+
GetIEditor()->Notify(eNotify_OnBeginGameMode);
m_pISystem->GetIMovieSystem()->EnablePhysicsEvents(true);
diff --git a/Code/Editor/Geometry/TriMesh.cpp b/Code/Editor/Geometry/TriMesh.cpp
index fe755ca6c3..737886cabc 100644
--- a/Code/Editor/Geometry/TriMesh.cpp
+++ b/Code/Editor/Geometry/TriMesh.cpp
@@ -19,13 +19,13 @@
//////////////////////////////////////////////////////////////////////////
CTriMesh::CTriMesh()
{
- pFaces = NULL;
- pVertices = NULL;
- pWSVertices = NULL;
- pUV = NULL;
- pColors = NULL;
- pEdges = NULL;
- pWeights = NULL;
+ pFaces = nullptr;
+ pVertices = nullptr;
+ pWSVertices = nullptr;
+ pUV = nullptr;
+ pColors = nullptr;
+ pEdges = nullptr;
+ pWeights = nullptr;
nFacesCount = 0;
nVertCount = 0;
@@ -67,7 +67,7 @@ void CTriMesh::ReallocStream(int stream, int nNewCount)
{
return; // Stream already have required size.
}
- void* pStream = 0;
+ void* pStream = nullptr;
int nElementSize = 0;
GetStreamInfo(stream, pStream, nElementSize);
pStream = ReAllocElements(pStream, nNewCount, nElementSize);
@@ -256,7 +256,7 @@ void CTriMesh::SharePositions()
std::vector arrHashTable[256];
CTriVertex* pNewVerts = new CTriVertex[GetVertexCount()];
- SMeshColor* pNewColors = 0;
+ SMeshColor* pNewColors = nullptr;
if (pColors)
{
pNewColors = new SMeshColor[GetVertexCount()];
@@ -433,8 +433,8 @@ void CTriMesh::UpdateIndexedMesh(IIndexedMesh* pIndexedMesh) const
//////////////////////////////////////////////////////////////////////////
void CTriMesh::CopyStream(CTriMesh& fromMesh, int stream)
{
- void* pTrgStream = 0;
- void* pSrcStream = 0;
+ void* pTrgStream = nullptr;
+ void* pSrcStream = nullptr;
int nElemSize = 0;
fromMesh.GetStreamInfo(stream, pSrcStream, nElemSize);
if (pSrcStream)
diff --git a/Code/Editor/Include/IAssetItem.h b/Code/Editor/Include/IAssetItem.h
index 892d347431..ff80331af5 100644
--- a/Code/Editor/Include/IAssetItem.h
+++ b/Code/Editor/Include/IAssetItem.h
@@ -334,12 +334,12 @@ struct IAssetItem
virtual void OnEndPreview() = 0;
// Description:
// If the asset has a special preview panel with utility controls, to be placed at the top of the Preview window, it can return an child dialog window
- // otherwise it can return NULL, if no panel is available
+ // otherwise it can return nullptr, if no panel is available
// Arguments:
- // pParentWnd - a valid CDialog*, or NULL
+ // pParentWnd - a valid CDialog*, or nullptr
// Return Value:
// A valid child dialog window handle, if this asset wants to have a custom panel in the top side of the Asset Preview window,
- // otherwise it can return NULL, if no panel is available
+ // otherwise it can return nullptr, if no panel is available
// See Also:
// OnBeginPreview(), OnEndPreview()
virtual QWidget* GetCustomPreviewPanelHeader(QWidget* pParentWnd) = 0;
diff --git a/Code/Editor/Include/IFileUtil.h b/Code/Editor/Include/IFileUtil.h
index f402786e67..f83c7e0d59 100644
--- a/Code/Editor/Include/IFileUtil.h
+++ b/Code/Editor/Include/IFileUtil.h
@@ -186,8 +186,15 @@ struct IFileUtil
virtual ECopyTreeResult CopyTree(const QString& strSourceDirectory, const QString& strTargetDirectory, bool boRecurse = true, bool boConfirmOverwrite = false) = 0;
//////////////////////////////////////////////////////////////////////////
- // @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
- // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
+ /**
+ * @brief CopyFile
+ * @param strSourceFile
+ * @param strTargetFile
+ * @param boConfirmOverwrite
+ * @param pfnProgress - called by the system to notify of file copy progress
+ * @param pbCancel - when the contents of this bool are set to true, the system cancels the copy operation
+ * @return
+ */
virtual ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = nullptr, bool* pbCancel = nullptr) = 0;
// As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
diff --git a/Code/Editor/LayoutWnd.h b/Code/Editor/LayoutWnd.h
index 106c32d0a0..918734ebb9 100644
--- a/Code/Editor/LayoutWnd.h
+++ b/Code/Editor/LayoutWnd.h
@@ -103,7 +103,7 @@ public:
static const char* GetConfigGroupName();
CLayoutViewPane* FindViewByClass(const QString& viewClassName);
- void BindViewport(CLayoutViewPane* vp, const QString& viewClassName, QWidget* pViewport = NULL);
+ void BindViewport(CLayoutViewPane* vp, const QString& viewClassName, QWidget* pViewport = nullptr);
QString ViewportTypeToClassName(EViewportType viewType);
//! Switch 2D viewports.
diff --git a/Code/Editor/LevelInfo.cpp b/Code/Editor/LevelInfo.cpp
index 5821f9c933..5ad7a6593d 100644
--- a/Code/Editor/LevelInfo.cpp
+++ b/Code/Editor/LevelInfo.cpp
@@ -93,7 +93,7 @@ void CLevelInfo::ValidateObjects()
pObject->Validate(m_pReport);
- m_pReport->SetCurrentValidatorObject(NULL);
+ m_pReport->SetCurrentValidatorObject(nullptr);
}
CLogFile::WriteLine("Validating Duplicate Objects...");
diff --git a/Code/Editor/LogFile.cpp b/Code/Editor/LogFile.cpp
index 8c04eab58c..c768f5013b 100644
--- a/Code/Editor/LogFile.cpp
+++ b/Code/Editor/LogFile.cpp
@@ -380,7 +380,7 @@ AZ_POP_DISABLE_WARNING
//////////////////////////////////////////////////////////////////////
#if defined(AZ_PLATFORM_WINDOWS)
- EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &DisplayConfig);
+ EnumDisplaySettings(nullptr, ENUM_CURRENT_SETTINGS, &DisplayConfig);
GetPrivateProfileString("boot.description", "display.drv",
"(Unknown graphics card)", szProfileBuffer, sizeof(szProfileBuffer),
"system.ini");
diff --git a/Code/Editor/MainWindow.cpp b/Code/Editor/MainWindow.cpp
index ff322b79ac..cd023f3b42 100644
--- a/Code/Editor/MainWindow.cpp
+++ b/Code/Editor/MainWindow.cpp
@@ -46,6 +46,7 @@ AZ_POP_DISABLE_WARNING
#include
#include
#include
+#include
// AzQtComponents
#include
@@ -160,45 +161,45 @@ public:
}
}
- ~EngineConnectionListener()
+ ~EngineConnectionListener() override
{
AzFramework::AssetSystemInfoBus::Handler::BusDisconnect();
AzFramework::EngineConnectionEvents::Bus::Handler::BusDisconnect();
}
public:
- virtual void Connected([[maybe_unused]] AzFramework::SocketConnection* connection)
+ void Connected([[maybe_unused]] AzFramework::SocketConnection* connection) override
{
m_state = EConnectionState::Connected;
}
- virtual void Connecting([[maybe_unused]] AzFramework::SocketConnection* connection)
+ void Connecting([[maybe_unused]] AzFramework::SocketConnection* connection) override
{
m_state = EConnectionState::Connecting;
}
- virtual void Listening([[maybe_unused]] AzFramework::SocketConnection* connection)
+ void Listening([[maybe_unused]] AzFramework::SocketConnection* connection) override
{
m_state = EConnectionState::Listening;
}
- virtual void Disconnecting([[maybe_unused]] AzFramework::SocketConnection* connection)
+ void Disconnecting([[maybe_unused]] AzFramework::SocketConnection* connection) override
{
m_state = EConnectionState::Disconnecting;
}
- virtual void Disconnected([[maybe_unused]] AzFramework::SocketConnection* connection)
+ void Disconnected([[maybe_unused]] AzFramework::SocketConnection* connection) override
{
m_state = EConnectionState::Disconnected;
}
- virtual void AssetCompilationSuccess(const AZStd::string& assetPath) override
+ void AssetCompilationSuccess(const AZStd::string& assetPath) override
{
m_lastAssetProcessorTask = assetPath;
}
- virtual void AssetCompilationFailed(const AZStd::string& assetPath) override
+ void AssetCompilationFailed(const AZStd::string& assetPath) override
{
m_failedJobs.insert(assetPath);
}
- virtual void CountOfAssetsInQueue(const int& count) override
+ void CountOfAssetsInQueue(const int& count) override
{
m_pendingJobsCount = count;
}
@@ -298,7 +299,7 @@ MainWindow::MainWindow(QWidget* parent)
, m_undoStateAdapter(new UndoStackStateAdapter(this))
, m_keyboardCustomization(nullptr)
, m_activeView(nullptr)
- , m_settings("O3DE", "O3DE")
+ , m_settings("O3DE", "O3DE")
, m_toolbarManager(new ToolbarManager(m_actionManager, this))
, m_assetImporterManager(new AssetImporterManager(this))
, m_levelEditorMenuHandler(new LevelEditorMenuHandler(this, m_viewPaneManager, m_settings))
@@ -573,7 +574,7 @@ void MainWindow::closeEvent(QCloseEvent* event)
if (GetIEditor()->GetDocument())
{
- GetIEditor()->GetDocument()->SetModifiedFlag(FALSE);
+ GetIEditor()->GetDocument()->SetModifiedFlag(false);
GetIEditor()->GetDocument()->SetModifiedModules(eModifiedNothing);
}
// Close all edit panels.
@@ -581,7 +582,7 @@ void MainWindow::closeEvent(QCloseEvent* event)
GetIEditor()->GetObjectManager()->EndEditParams();
// force clean up of all deferred deletes, so that we don't have any issues with windows from plugins not being deleted yet
- qApp->sendPostedEvents(0, QEvent::DeferredDelete);
+ qApp->sendPostedEvents(nullptr, QEvent::DeferredDelete);
QMainWindow::closeEvent(event);
}
@@ -731,32 +732,84 @@ void MainWindow::InitActions()
.SetStatusTip(tr("Restore saved state (Fetch)"));
// Modify actions
- am->AddAction(ID_EDITMODE_MOVE, tr("Move"))
+ am->AddAction(AzToolsFramework::EditModeMove, tr("Move"))
.SetIcon(Style::icon("Move"))
.SetApplyHoverEffect()
.SetShortcut(tr("1"))
.SetToolTip(tr("Move (1)"))
.SetCheckable(true)
.SetStatusTip(tr("Select and move selected object(s)"))
- .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeMove);
- am->AddAction(ID_EDITMODE_ROTATE, tr("Rotate"))
+ .RegisterUpdateCallback([](QAction* action)
+ {
+ Q_ASSERT(action->isCheckable());
+
+ AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
+ AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+ mode, AzToolsFramework::GetEntityContextId(),
+ &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
+
+ action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Translation);
+ })
+ .Connect(
+ &QAction::triggered,
+ []()
+ {
+ EditorTransformComponentSelectionRequestBus::Event(
+ GetEntityContextId(), &EditorTransformComponentSelectionRequests::SetTransformMode,
+ EditorTransformComponentSelectionRequests::Mode::Translation);
+ });
+ am->AddAction(AzToolsFramework::EditModeRotate, tr("Rotate"))
.SetIcon(Style::icon("Translate"))
.SetApplyHoverEffect()
.SetShortcut(tr("2"))
.SetToolTip(tr("Rotate (2)"))
.SetCheckable(true)
.SetStatusTip(tr("Select and rotate selected object(s)"))
- .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeRotate);
- am->AddAction(ID_EDITMODE_SCALE, tr("Scale"))
+ .RegisterUpdateCallback([](QAction* action)
+ {
+ Q_ASSERT(action->isCheckable());
+
+ AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
+ AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+ mode, AzToolsFramework::GetEntityContextId(),
+ &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
+
+ action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Rotation);
+ })
+ .Connect(
+ &QAction::triggered,
+ []()
+ {
+ EditorTransformComponentSelectionRequestBus::Event(
+ GetEntityContextId(), &EditorTransformComponentSelectionRequests::SetTransformMode,
+ EditorTransformComponentSelectionRequests::Mode::Rotation);
+ });
+ am->AddAction(AzToolsFramework::EditModeScale, tr("Scale"))
.SetIcon(Style::icon("Scale"))
.SetApplyHoverEffect()
.SetShortcut(tr("3"))
.SetToolTip(tr("Scale (3)"))
.SetCheckable(true)
.SetStatusTip(tr("Select and scale selected object(s)"))
- .RegisterUpdateCallback(cryEdit, &CCryEditApp::OnUpdateEditmodeScale);
+ .RegisterUpdateCallback([](QAction* action)
+ {
+ Q_ASSERT(action->isCheckable());
- am->AddAction(ID_SNAP_TO_GRID, tr("Snap to grid"))
+ AzToolsFramework::EditorTransformComponentSelectionRequests::Mode mode;
+ AzToolsFramework::EditorTransformComponentSelectionRequestBus::EventResult(
+ mode, AzToolsFramework::GetEntityContextId(),
+ &AzToolsFramework::EditorTransformComponentSelectionRequests::GetTransformMode);
+
+ action->setChecked(mode == AzToolsFramework::EditorTransformComponentSelectionRequests::Mode::Scale);
+ })
+ .Connect( &QAction::triggered,[]()
+ {
+ EditorTransformComponentSelectionRequestBus::Event(
+ GetEntityContextId(), &EditorTransformComponentSelectionRequests::SetTransformMode,
+ EditorTransformComponentSelectionRequests::Mode::Scale);
+ });
+
+ am->AddAction(AzToolsFramework::SnapToGrid, tr("Snap to grid"))
.SetIcon(Style::icon("Grid"))
.SetApplyHoverEffect()
.SetShortcut(tr("G"))
@@ -769,7 +822,7 @@ void MainWindow::InitActions()
})
.Connect(&QAction::triggered, []() { SandboxEditor::SetGridSnapping(!SandboxEditor::GridSnappingEnabled()); });
- am->AddAction(ID_SNAPANGLE, tr("Snap angle"))
+ am->AddAction(AzToolsFramework::SnapAngle, tr("Snap angle"))
.SetIcon(Style::icon("Angle"))
.SetApplyHoverEffect()
.SetStatusTip(tr("Snap angle"))
@@ -1243,7 +1296,7 @@ void MainWindow::OnEditorNotifyEvent(EEditorNotifyEvent ev)
auto cryEdit = CCryEditApp::instance();
if (cryEdit)
{
- cryEdit->SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
+ cryEdit->SetEditorWindowTitle(nullptr, AZ::Utils::GetProjectName().c_str(), GetIEditor()->GetGameEngine()->GetLevelName());
}
}
break;
@@ -1252,7 +1305,7 @@ void MainWindow::OnEditorNotifyEvent(EEditorNotifyEvent ev)
auto cryEdit = CCryEditApp::instance();
if (cryEdit)
{
- cryEdit->SetEditorWindowTitle(0, AZ::Utils::GetProjectName().c_str(), 0);
+ cryEdit->SetEditorWindowTitle(nullptr, AZ::Utils::GetProjectName().c_str(), nullptr);
}
}
break;
@@ -1351,8 +1404,8 @@ void MainWindow::ResetAutoSaveTimers(bool bForceInit)
{
delete m_autoRemindTimer;
}
- m_autoSaveTimer = 0;
- m_autoRemindTimer = 0;
+ m_autoSaveTimer = nullptr;
+ m_autoRemindTimer = nullptr;
if (bForceInit)
{
@@ -1389,7 +1442,7 @@ void MainWindow::ResetBackgroundUpdateTimer()
if (m_backgroundUpdateTimer)
{
delete m_backgroundUpdateTimer;
- m_backgroundUpdateTimer = 0;
+ m_backgroundUpdateTimer = nullptr;
}
ICVar* pBackgroundUpdatePeriod = gEnv->pConsole->GetCVar("ed_backgroundUpdatePeriod");
@@ -1435,7 +1488,7 @@ void MainWindow::OnRefreshAudioSystem()
if (QString::compare(sLevelName, "Untitled", Qt::CaseInsensitive) == 0)
{
- // Rather pass NULL to indicate that no level is loaded!
+ // Rather pass nullptr to indicate that no level is loaded!
sLevelName = QString();
}
@@ -1868,7 +1921,7 @@ QWidget* MainWindow::CreateToolbarWidget(int actionId)
break;
case ID_TOOLBAR_WIDGET_SPACER_RIGHT:
w = CreateSpacerRightWidget();
- break;
+ break;
default:
qWarning() << Q_FUNC_INFO << "Unknown id " << actionId;
return nullptr;
diff --git a/Code/Editor/MainWindow.h b/Code/Editor/MainWindow.h
index e70355827c..1e375b08f2 100644
--- a/Code/Editor/MainWindow.h
+++ b/Code/Editor/MainWindow.h
@@ -59,11 +59,17 @@ namespace AzQtComponents
namespace AzToolsFramework
{
class Ticker;
-}
-
-namespace AzToolsFramework
-{
class QtSourceControlNotificationHandler;
+
+ //! @name Reverse URLs.
+ //! Used to identify common actions and override them when necessary.
+ //@{
+ constexpr inline AZ::Crc32 EditModeMove = AZ_CRC_CE("com.o3de.action.editor.editmode.move");
+ constexpr inline AZ::Crc32 EditModeRotate = AZ_CRC_CE("com.o3de.action.editor.editmode.rotate");
+ constexpr inline AZ::Crc32 EditModeScale = AZ_CRC_CE("com.o3de.action.editor.editmode.scale");
+ constexpr inline AZ::Crc32 SnapToGrid = AZ_CRC_CE("com.o3de.action.editor.snaptogrid");
+ constexpr inline AZ::Crc32 SnapAngle = AZ_CRC_CE("com.o3de.action.editor.snapangle");
+ //@}
}
#define MAINFRM_LAYOUT_NORMAL "NormalLayout"
diff --git a/Code/Editor/NewLevelDialog.cpp b/Code/Editor/NewLevelDialog.cpp
index 7db795333b..29445cef2b 100644
--- a/Code/Editor/NewLevelDialog.cpp
+++ b/Code/Editor/NewLevelDialog.cpp
@@ -19,7 +19,7 @@
#include
// Editor
-#include "NewTerrainDialog.h"
+#include "NewTerrainDialog.h"
AZ_PUSH_DISABLE_DLL_EXPORT_MEMBER_WARNING
#include
@@ -54,7 +54,7 @@ private:
// CNewLevelDialog dialog
-CNewLevelDialog::CNewLevelDialog(QWidget* pParent /*=NULL*/)
+CNewLevelDialog::CNewLevelDialog(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_bUpdate(false)
, ui(new Ui::CNewLevelDialog)
@@ -69,7 +69,7 @@ CNewLevelDialog::CNewLevelDialog(QWidget* pParent /*=NULL*/)
m_bIsResize = false;
-
+
ui->TITLE->setText(tr("Assign a name and location to the new level."));
ui->STATIC1->setText(tr("Location:"));
ui->STATIC2->setText(tr("Name:"));
@@ -98,7 +98,7 @@ CNewLevelDialog::CNewLevelDialog(QWidget* pParent /*=NULL*/)
m_levelFolders = GetLevelsFolder();
m_level = "";
- // First of all, keyboard focus is related to widget tab order, and the default tab order is based on the order in which
+ // First of all, keyboard focus is related to widget tab order, and the default tab order is based on the order in which
// widgets are constructed. Therefore, creating more widgets changes the keyboard focus. That is why setFocus() is called last.
// Secondly, using singleShot() allows setFocus() slot of the QLineEdit instance to be invoked right after the event system
// is ready to do so. Therefore, it is better to use singleShot() than directly call setFocus().
diff --git a/Code/Editor/NewTerrainDialog.cpp b/Code/Editor/NewTerrainDialog.cpp
index 16641ee275..0e66482eb4 100644
--- a/Code/Editor/NewTerrainDialog.cpp
+++ b/Code/Editor/NewTerrainDialog.cpp
@@ -19,7 +19,7 @@ AZ_POP_DISABLE_WARNING
-CNewTerrainDialog::CNewTerrainDialog(QWidget* pParent /*=NULL*/)
+CNewTerrainDialog::CNewTerrainDialog(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_terrainResolutionIndex(0)
, m_terrainUnitsIndex(0)
diff --git a/Code/Editor/Objects/DisplayContextShared.inl b/Code/Editor/Objects/DisplayContextShared.inl
index 1791c22443..a602d8eca9 100644
--- a/Code/Editor/Objects/DisplayContextShared.inl
+++ b/Code/Editor/Objects/DisplayContextShared.inl
@@ -74,12 +74,12 @@ void DisplayContext::DrawTri(const Vec3& p1, const Vec3& p2, const Vec3& p3)
void DisplayContext::DrawTriangles(const AZStd::vector& vertices, const ColorB& color)
{
- pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), color);
+ pRenderAuxGeom->DrawTriangles(vertices.begin(), static_cast(vertices.size()), color);
}
void DisplayContext::DrawTrianglesIndexed(const AZStd::vector& vertices, const AZStd::vector& indices, const ColorB& color)
{
- pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), indices.begin(), indices.size(), color);
+ pRenderAuxGeom->DrawTriangles(vertices.begin(), static_cast(vertices.size()), indices.begin(), static_cast(indices.size()), color);
}
//////////////////////////////////////////////////////////////////////////
@@ -862,7 +862,7 @@ void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2, const QColor& rgb1
//////////////////////////////////////////////////////////////////////////
void DisplayContext::DrawLines(const AZStd::vector& points, const ColorF& color)
{
- pRenderAuxGeom->DrawLines(points.begin(), points.size(), color, m_thickness);
+ pRenderAuxGeom->DrawLines(points.begin(), static_cast(points.size()), color, m_thickness);
}
//////////////////////////////////////////////////////////////////////////
@@ -1287,8 +1287,8 @@ void DisplayContext::Flush2D()
uvs[3] = 0;
uvt[3] = 0;
- int nLabels = m_textureLabels.size();
- for (int i = 0; i < nLabels; i++)
+ const size_t nLabels = m_textureLabels.size();
+ for (size_t i = 0; i < nLabels; i++)
{
STextureLabel& t = m_textureLabels[i];
float w2 = t.w * 0.5f;
diff --git a/Code/Editor/Objects/EntityObject.h b/Code/Editor/Objects/EntityObject.h
index 76bd71a1f1..34d3342ad4 100644
--- a/Code/Editor/Objects/EntityObject.h
+++ b/Code/Editor/Objects/EntityObject.h
@@ -163,7 +163,7 @@ public:
//////////////////////////////////////////////////////////////////////////
//! Return number of event targets of Script.
- int GetEventTargetCount() const { return m_eventTargets.size(); };
+ int GetEventTargetCount() const { return static_cast(m_eventTargets.size()); };
CEntityEventTarget& GetEventTarget(int index) { return m_eventTargets[index]; };
//! Add new event target, returns index of created event target.
//! Event targets are Always entities.
@@ -176,7 +176,7 @@ public:
// Entity Links.
//////////////////////////////////////////////////////////////////////////
//! Return number of event targets of Script.
- int GetEntityLinkCount() const { return m_links.size(); };
+ int GetEntityLinkCount() const { return static_cast(m_links.size()); };
CEntityLink& GetEntityLink(int index) { return m_links[index]; };
virtual int AddEntityLink(const QString& name, GUID targetEntityId);
virtual bool EntityLinkExists(const QString& name, GUID targetEntityId);
diff --git a/Code/Editor/Objects/ObjectLoader.h b/Code/Editor/Objects/ObjectLoader.h
index 350ffa10a9..ccfaeb78f0 100644
--- a/Code/Editor/Objects/ObjectLoader.h
+++ b/Code/Editor/Objects/ObjectLoader.h
@@ -70,7 +70,7 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
CBaseObject* LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject = NULL);
//////////////////////////////////////////////////////////////////////////
- int GetLoadedObjectsCount() { return m_loadedObjects.size(); }
+ int GetLoadedObjectsCount() { return static_cast(m_loadedObjects.size()); }
CBaseObject* GetLoadedObject(int nIndex) const { return m_loadedObjects[nIndex].pObject; }
//! If true new loaded objects will be assigned new GUIDs.
diff --git a/Code/Editor/Objects/ObjectManager.h b/Code/Editor/Objects/ObjectManager.h
index f59f6c43b8..aa9faab0e4 100644
--- a/Code/Editor/Objects/ObjectManager.h
+++ b/Code/Editor/Objects/ObjectManager.h
@@ -58,7 +58,7 @@ public:
class CBaseObjectsCache
{
public:
- int GetObjectCount() const { return m_objects.size(); }
+ int GetObjectCount() const { return static_cast(m_objects.size()); }
CBaseObject* GetObject(int nIndex) const { return m_objects[nIndex]; }
void AddObject(CBaseObject* object);
diff --git a/Code/Editor/Objects/SelectionGroup.h b/Code/Editor/Objects/SelectionGroup.h
index 8f6feb32ad..600bce5f26 100644
--- a/Code/Editor/Objects/SelectionGroup.h
+++ b/Code/Editor/Objects/SelectionGroup.h
@@ -71,7 +71,7 @@ public:
//! And save resulting objects to saveTo selection.
void FilterParents();
//! Get number of child filtered objects.
- int GetFilteredCount() const { return m_filtered.size(); }
+ int GetFilteredCount() const { return static_cast(m_filtered.size()); }
CBaseObject* GetFilteredObject(int i) const { return m_filtered[i]; }
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Plugin.cpp b/Code/Editor/Plugin.cpp
index 0fb37c96c7..e73b9daa2c 100644
--- a/Code/Editor/Plugin.cpp
+++ b/Code/Editor/Plugin.cpp
@@ -133,7 +133,7 @@ IClassDesc* CClassFactory::FindClass(const char* pClassName) const
if (!pSubClassName)
{
- return NULL;
+ return nullptr;
}
QString name = QString(pClassName).left(pSubClassName - pClassName);
@@ -169,7 +169,7 @@ void CClassFactory::UnregisterClass(const char* pClassName)
{
IClassDesc* pClassDesc = FindClass(pClassName);
- if (pClassDesc == NULL)
+ if (pClassDesc == nullptr)
{
return;
}
diff --git a/Code/Editor/PluginManager.cpp b/Code/Editor/PluginManager.cpp
index f03cb54fce..5efd52a97e 100644
--- a/Code/Editor/PluginManager.cpp
+++ b/Code/Editor/PluginManager.cpp
@@ -18,8 +18,8 @@
#include "Include/IPlugin.h"
-typedef IPlugin* (* TPfnCreatePluginInstance)(PLUGIN_INIT_PARAM* pInitParam);
-typedef void (* TPfnQueryPluginSettings)(SPluginSettings&);
+using TPfnCreatePluginInstance = IPlugin *(*)(PLUGIN_INIT_PARAM *pInitParam);
+using TPfnQueryPluginSettings = void (*)(SPluginSettings &);
CPluginManager::CPluginManager()
{
@@ -210,7 +210,7 @@ bool CPluginManager::LoadPlugins(const char* pPathWithMask)
continue;
}
- IPlugin* pPlugin = NULL;
+ IPlugin* pPlugin = nullptr;
PLUGIN_INIT_PARAM sInitParam =
{
GetIEditor(),
@@ -279,7 +279,7 @@ IPlugin* CPluginManager::GetPluginByGUID(const char* pGUID)
}
}
- return NULL;
+ return nullptr;
}
IPlugin* CPluginManager::GetPluginByUIID(uint8 iUserInterfaceID)
@@ -290,7 +290,7 @@ IPlugin* CPluginManager::GetPluginByUIID(uint8 iUserInterfaceID)
if (it == m_uuidPluginMap.end())
{
- return NULL;
+ return nullptr;
}
return (*it).second;
@@ -302,7 +302,7 @@ IUIEvent* CPluginManager::GetEventByIDAndPluginID(uint8 aPluginID, uint8 aEventI
// specified by its ID and the user interface ID of the plugin which
// created the UI element
- IPlugin* pPlugin = NULL;
+ IPlugin* pPlugin = nullptr;
TEventHandlerIt eventIt;
TPluginEventIt pluginIt;
@@ -310,21 +310,21 @@ IUIEvent* CPluginManager::GetEventByIDAndPluginID(uint8 aPluginID, uint8 aEventI
if (!pPlugin)
{
- return NULL;
+ return nullptr;
}
pluginIt = m_pluginEventMap.find(pPlugin);
if (pluginIt == m_pluginEventMap.end())
{
- return NULL;
+ return nullptr;
}
eventIt = (*pluginIt).second.find(aEventID);
if (eventIt == (*pluginIt).second.end())
{
- return NULL;
+ return nullptr;
}
return (*eventIt).second;
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
index 29db338a85..51fcdaa012 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/SandboxIntegration.cpp
@@ -804,7 +804,7 @@ void SandboxIntegrationManager::SetupLayerContextMenu(QMenu* menu)
menu->addSeparator();
- const int selectedLayerCount = layersInSelection.size();
+ const int selectedLayerCount = static_cast(layersInSelection.size());
QString saveTitle = QObject::tr("Save layer");
if(selectedLayerCount > 1)
{
diff --git a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
index 50d111d9b3..02d2174fb8 100644
--- a/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
+++ b/Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/Outliner/OutlinerListModel.cpp
@@ -259,7 +259,7 @@ QVariant OutlinerListModel::dataForName(const QModelIndex& index, int role) cons
if (highlightTextIndex >= 0)
{
const QString BACKGROUND_COLOR{ "#707070" };
- label.insert(highlightTextIndex + m_filterString.length(), "");
+ label.insert(static_cast(highlightTextIndex + m_filterString.length()), "");
label.insert(highlightTextIndex, "");
}
} while(highlightTextIndex > 0);
diff --git a/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.cpp b/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.cpp
index f1f742949c..6e9c0a42b0 100644
--- a/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.cpp
+++ b/Code/Editor/Plugins/PerforcePlugin/PasswordDlg.cpp
@@ -53,7 +53,7 @@ namespace PerforceConnection
setEnabled(false);
- int numSettingsToGet = m_retrievedSettings.size();
+ int numSettingsToGet = static_cast(m_retrievedSettings.size());
auto applySettingResultFunction = [this, &numSettingsToGet](AZStd::string setting, const SourceControlSettingInfo& info) -> void
{
diff --git a/Code/Editor/PythonEditorFuncs.cpp b/Code/Editor/PythonEditorFuncs.cpp
index 93f5f8f10f..2b7bca3b0b 100644
--- a/Code/Editor/PythonEditorFuncs.cpp
+++ b/Code/Editor/PythonEditorFuncs.cpp
@@ -323,7 +323,7 @@ namespace
//////////////////////////////////////////////////////////////////////////
void GetPythonArgumentsVector(const char* pArguments, QStringList& inputArguments)
{
- if (pArguments == NULL)
+ if (pArguments == nullptr)
{
return;
}
diff --git a/Code/Editor/QtUI/QCollapsibleGroupBox.cpp b/Code/Editor/QtUI/QCollapsibleGroupBox.cpp
index e1d3f59510..7fe56285e6 100644
--- a/Code/Editor/QtUI/QCollapsibleGroupBox.cpp
+++ b/Code/Editor/QtUI/QCollapsibleGroupBox.cpp
@@ -13,7 +13,7 @@
QCollapsibleGroupBox::QCollapsibleGroupBox(QWidget* parent)
: QGroupBox(parent)
, m_collapsed(false)
- , m_toggleButton(0)
+ , m_toggleButton(nullptr)
{
m_toggleButton = new QToolButton(this);
m_toggleButton->setFixedSize(16, 16);
diff --git a/Code/Editor/RenderHelpers/AxisHelper.h b/Code/Editor/RenderHelpers/AxisHelper.h
index b7d246d48c..70dcd2dae2 100644
--- a/Code/Editor/RenderHelpers/AxisHelper.h
+++ b/Code/Editor/RenderHelpers/AxisHelper.h
@@ -60,7 +60,7 @@ public:
void DrawDome(const Matrix34& worldTM, const SGizmoParameters& setup, DisplayContext& dc, AABB& objectBox);
bool HitTest(const Matrix34& worldTM, const SGizmoParameters& setup, HitContext& hc);
- bool HitTestForRotationCircle(const Matrix34& worldTM, IDisplayViewport* view, const QPoint& pos, float fHitWidth, Vec3* pOutHitPos = NULL, Vec3* pOutHitNormal = NULL);
+ bool HitTestForRotationCircle(const Matrix34& worldTM, IDisplayViewport* view, const QPoint& pos, float fHitWidth, Vec3* pOutHitPos = nullptr, Vec3* pOutHitNormal = nullptr);
void SetHighlightAxis(int axis) { m_highlightAxis = axis; };
int GetHighlightAxis() const { return m_highlightAxis; };
diff --git a/Code/Editor/RenderHelpers/AxisHelperShared.inl b/Code/Editor/RenderHelpers/AxisHelperShared.inl
index 9db4c82e84..2ceac98eae 100644
--- a/Code/Editor/RenderHelpers/AxisHelperShared.inl
+++ b/Code/Editor/RenderHelpers/AxisHelperShared.inl
@@ -546,7 +546,7 @@ bool CAxisHelper::HitTestForRotationCircle(const Matrix34& worldTM, IDisplayView
Vec3 vShortestHitPos;
float shortestDist = 3e11f;
- for (int i = 0, iCount(vList.size()); i < iCount; ++i)
+ for (int i = 0, iCount(static_cast(vList.size())); i < iCount; ++i)
{
const Vec3& v0 = vList[i];
const Vec3& v1 = vList[(i + 1) % iCount];
diff --git a/Code/Editor/ResizeResolutionDialog.cpp b/Code/Editor/ResizeResolutionDialog.cpp
index ad57650afa..f2a03fb1b2 100644
--- a/Code/Editor/ResizeResolutionDialog.cpp
+++ b/Code/Editor/ResizeResolutionDialog.cpp
@@ -89,7 +89,7 @@ int ResizeResolutionModel::SizeRow(uint32 dwSize) const
// CResizeResolutionDialog dialog
-CResizeResolutionDialog::CResizeResolutionDialog(QWidget* pParent /*=NULL*/)
+CResizeResolutionDialog::CResizeResolutionDialog(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_model(new ResizeResolutionModel(this))
, ui(new Ui::CResizeResolutionDialog)
diff --git a/Code/Editor/Resource.h b/Code/Editor/Resource.h
index a6f714afa4..b3640fac70 100644
--- a/Code/Editor/Resource.h
+++ b/Code/Editor/Resource.h
@@ -82,7 +82,6 @@
#define ID_TOOLS_CUSTOMIZEKEYBOARD 32914
#define ID_EXPORT_INDOORS 32915
#define ID_VIEW_CYCLE2DVIEWPORT 32916
-#define ID_SNAPANGLE 32917
#define ID_PHYSICS_GETPHYSICSSTATE 32937
#define ID_PHYSICS_RESETPHYSICSSTATE 32938
#define ID_GAME_SYNCPLAYER 32941
@@ -108,9 +107,6 @@
#define ID_MOVE_OBJECT 33481
#define ID_RENAME_OBJ 33483
#define ID_FETCH 33496
-#define ID_EDITMODE_ROTATE 33506
-#define ID_EDITMODE_SCALE 33507
-#define ID_EDITMODE_MOVE 33508
#define ID_SELECTION_DELETE 33512
#define ID_EDIT_ESCAPE 33513
#define ID_UNDO 33524
@@ -137,7 +133,6 @@
#define ID_ADDNODE 33570
#define ID_ADDSCENETRACK 33573
#define ID_FIND 33574
-#define ID_SNAP_TO_GRID 33575
#define ID_TAG_LOC1 33576
#define ID_TAG_LOC2 33577
#define ID_TAG_LOC3 33578
diff --git a/Code/Editor/ResourceSelectorHost.cpp b/Code/Editor/ResourceSelectorHost.cpp
index d265b3ffbe..af6c398fe7 100644
--- a/Code/Editor/ResourceSelectorHost.cpp
+++ b/Code/Editor/ResourceSelectorHost.cpp
@@ -101,7 +101,7 @@ public:
}
private:
- typedef std::map > TTypeMap;
+ using TTypeMap = std::map>;
TTypeMap m_typeMap;
std::map m_globallySelectedResources;
diff --git a/Code/Editor/SelectEAXPresetDlg.cpp b/Code/Editor/SelectEAXPresetDlg.cpp
index 4a5ea9b66c..733de8b9cf 100644
--- a/Code/Editor/SelectEAXPresetDlg.cpp
+++ b/Code/Editor/SelectEAXPresetDlg.cpp
@@ -49,7 +49,7 @@ QString CSelectEAXPresetDlg::GetCurrPreset() const
{
return m_ui->listView->currentIndex().data().toString();
}
- // EXCEPTION: OCX Property Pages should return FALSE
+ // EXCEPTION: OCX Property Pages should return false
return QString();
}
diff --git a/Code/Editor/Settings.cpp b/Code/Editor/Settings.cpp
index 8226081bd6..a4745cd37a 100644
--- a/Code/Editor/Settings.cpp
+++ b/Code/Editor/Settings.cpp
@@ -190,6 +190,7 @@ SEditorSettings::SEditorSettings()
consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
bShowTimeInConsole = false;
+ clearConsoleOnGameModeStart = false;
enableSceneInspector = false;
@@ -244,7 +245,7 @@ SEditorSettings::SEditorSettings()
gui.nToolbarIconSize = static_cast(AzQtComponents::ToolBar::ToolBarIconSize::Default);
- int lfHeight = 8;// -MulDiv(8, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72);
+ int lfHeight = 8;// -MulDiv(8, GetDeviceCaps(GetDC(nullptr), LOGPIXELSY), 72);
gui.nDefaultFontHieght = lfHeight;
gui.hSystemFont = QFont("Ms Shell Dlg 2", lfHeight, QFont::Normal);
gui.hSystemFontBold = QFont("Ms Shell Dlg 2", lfHeight, QFont::Bold);
@@ -528,10 +529,12 @@ void SEditorSettings::Save()
SaveValue("Settings", "ConsoleBackgroundColorThemeV2", (int)consoleBackgroundColorTheme);
+ SaveValue("Settings", "ClearConsoleOnGameModeStart", clearConsoleOnGameModeStart);
+
SaveValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
SaveValue("Settings", "EnableSceneInspector", enableSceneInspector);
-
+
//////////////////////////////////////////////////////////////////////////
// Viewport settings.
//////////////////////////////////////////////////////////////////////////
@@ -624,7 +627,7 @@ void SEditorSettings::Save()
SaveValue("Settings\\AssetBrowser", "AutoFilterFromViewportSelection", sAssetBrowserSettings.bAutoFilterFromViewportSelection);
SaveValue("Settings\\AssetBrowser", "VisibleColumnNames", sAssetBrowserSettings.sVisibleColumnNames);
SaveValue("Settings\\AssetBrowser", "ColumnNames", sAssetBrowserSettings.sColumnNames);
-
+
//////////////////////////////////////////////////////////////////////////
// Deep Selection Settings
//////////////////////////////////////////////////////////////////////////
@@ -703,7 +706,7 @@ void SEditorSettings::Load()
QString strPlaceholderString;
// Load settings from registry.
LoadValue("Settings", "UndoLevels", undoLevels);
- LoadValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);
+ LoadValue("Settings", "UndoSliceOverrideSaveValue", m_undoSliceOverrideSaveValue);
LoadValue("Settings", "ShowWelcomeScreenAtStartup", bShowDashboardAtStartup);
LoadValue("Settings", "ShowCircularDependencyError", m_showCircularDependencyError);
LoadValue("Settings", "LoadLastLevelAtStartup", bAutoloadLastLevelAtStartup);
@@ -746,6 +749,8 @@ void SEditorSettings::Load()
consoleBackgroundColorTheme = AzToolsFramework::ConsoleColorTheme::Dark;
}
+ LoadValue("Settings", "ClearConsoleOnGameModeStart", clearConsoleOnGameModeStart);
+
LoadValue("Settings", "ShowTimeInConsole", bShowTimeInConsole);
LoadValue("Settings", "EnableSceneInspector", enableSceneInspector);
@@ -1084,7 +1089,7 @@ void SEditorSettings::ConvertPath(const AZStd::string_view sourcePath, AZStd::st
AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::GetValue(const AZStd::string_view path)
{
- if (path.find("|") < 0)
+ if (path.find("|") == AZStd::string_view::npos)
{
return { AZStd::string("Invalid Path - could not find separator \"|\"") };
}
@@ -1102,7 +1107,7 @@ AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::Get
AzToolsFramework::EditorSettingsAPIRequests::SettingOutcome SEditorSettings::SetValue(const AZStd::string_view path, const AZStd::any& value)
{
- if (path.find("|") < 0)
+ if (path.find("|") == AZStd::string_view::npos)
{
return { AZStd::string("Invalid Path - could not find separator \"|\"") };
}
diff --git a/Code/Editor/Settings.h b/Code/Editor/Settings.h
index 979820e5e6..39a4093915 100644
--- a/Code/Editor/Settings.h
+++ b/Code/Editor/Settings.h
@@ -380,6 +380,7 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
//! Source Control Enabling.
bool enableSourceControl;
+ bool clearConsoleOnGameModeStart;
//! Text editor.
QString textEditorForScript;
diff --git a/Code/Editor/SettingsManager.cpp b/Code/Editor/SettingsManager.cpp
index 82e3eaf1e6..27031ca43e 100644
--- a/Code/Editor/SettingsManager.cpp
+++ b/Code/Editor/SettingsManager.cpp
@@ -105,7 +105,7 @@ bool CSettingsManager::CreateDefaultLayoutSettingsFile()
AZStd::vector CSettingsManager::BuildSettingsList()
{
- XmlNodeRef root = NULL;
+ XmlNodeRef root = nullptr;
root = m_pSettingsManagerMemoryNode;
@@ -132,8 +132,8 @@ void CSettingsManager::BuildSettingsList_Helper(const XmlNodeRef& node, const AZ
{
for (int i = 0; i < node->getNumAttributes(); ++i)
{
- const char* key = NULL;
- const char* value = NULL;
+ const char* key = nullptr;
+ const char* value = nullptr;
node->getAttributeByIndex(i, &key, &value);
if (!pathToNode.empty())
{
@@ -163,7 +163,7 @@ void CSettingsManager::BuildSettingsList_Helper(const XmlNodeRef& node, const AZ
result
);
}
-
+
}
}
}
@@ -190,7 +190,7 @@ void CSettingsManager::SaveSetting(const QString& path, const QString& attr, con
// Spaces in node names not allowed
writeAttr.replace(" ", "");
- XmlNodeRef root = NULL;
+ XmlNodeRef root = nullptr;
root = m_pSettingsManagerMemoryNode;
@@ -276,11 +276,11 @@ XmlNodeRef CSettingsManager::LoadSetting(const QString& path, const QString& att
// Spaces in node names not allowed
readAttr.replace(" ", "");
- XmlNodeRef root = NULL;
+ XmlNodeRef root = nullptr;
root = m_pSettingsManagerMemoryNode;
- XmlNodeRef tmpNode = NULL;
+ XmlNodeRef tmpNode = nullptr;
if (NeedSettingsNode(path))
{
@@ -293,7 +293,7 @@ XmlNodeRef CSettingsManager::LoadSetting(const QString& path, const QString& att
if (!tmpNode)
{
- return 0;
+ return nullptr;
}
for (int i = 0; i < strNodes.size(); ++i)
@@ -304,13 +304,13 @@ XmlNodeRef CSettingsManager::LoadSetting(const QString& path, const QString& att
}
else
{
- return 0;
+ return nullptr;
}
}
if (!tmpNode->findChild(readAttr.toUtf8().data()))
{
- return 0;
+ return nullptr;
}
else
{
@@ -360,7 +360,7 @@ void CSettingsManager::AddToolVersion(const QString& toolName, const QString& to
return;
}
- if (stl::find_in_map(m_toolNames, toolName, NULL) == "")
+ if (stl::find_in_map(m_toolNames, toolName, nullptr) == "")
{
if (!toolVersion.isEmpty())
{
@@ -380,7 +380,7 @@ void CSettingsManager::AddToolName(const QString& toolName, const QString& human
return;
}
- if (stl::find_in_map(m_toolNames, toolName, NULL) == "")
+ if (stl::find_in_map(m_toolNames, toolName, nullptr) == "")
{
if (!humanReadableName.isEmpty())
{
@@ -499,7 +499,7 @@ void CSettingsManager::GetMatchingLayoutNames(TToolNamesMap& foundTools, XmlNode
return;
}
- TToolNamesMap* toolNames = NULL;
+ TToolNamesMap* toolNames = nullptr;
if (!foundTools.empty())
{
@@ -593,11 +593,11 @@ bool CSettingsManager::NeedSettingsNode(const QString& path)
{
if ((path != EDITOR_LAYOUT_ROOT_NODE) && (path != TOOLBOX_NODE) && (path != TOOLBOXMACROS_NODE))
{
- return TRUE;
+ return true;
}
else
{
- return FALSE;
+ return false;
}
}
@@ -605,13 +605,13 @@ void CSettingsManager::SerializeCVars(XmlNodeRef& node, bool bLoad)
{
int nNumberOfVariables(0);
int nCurrentVariable(0);
- IConsole* piConsole(NULL);
- ICVar* piVariable(NULL);
+ IConsole* piConsole(nullptr);
+ ICVar* piVariable(nullptr);
std::vector cszVariableNames;
- char* szKey(NULL);
- char* szValue(NULL);
- ICVar* piCVar(NULL);
+ char* szKey(nullptr);
+ char* szValue(nullptr);
+ ICVar* piCVar(nullptr);
piConsole = gEnv->pConsole;
@@ -622,7 +622,7 @@ void CSettingsManager::SerializeCVars(XmlNodeRef& node, bool bLoad)
if (bLoad)
{
- XmlNodeRef readNode = NULL;
+ XmlNodeRef readNode = nullptr;
XmlNodeRef inputCVarsNode = node->findChild(CVARS_NODE);
if (!inputCVarsNode)
@@ -649,7 +649,7 @@ void CSettingsManager::SerializeCVars(XmlNodeRef& node, bool bLoad)
}
else
{
- XmlNodeRef newCVarNode = NULL;
+ XmlNodeRef newCVarNode = nullptr;
XmlNodeRef oldCVarsNode = node->findChild(CVARS_NODE);
if (oldCVarsNode)
@@ -660,9 +660,9 @@ void CSettingsManager::SerializeCVars(XmlNodeRef& node, bool bLoad)
XmlNodeRef cvarsNode = XmlHelpers::CreateXmlNode(CVARS_NODE);
nNumberOfVariables = piConsole->GetNumVisibleVars();
- cszVariableNames.resize(nNumberOfVariables, NULL);
+ cszVariableNames.resize(nNumberOfVariables, nullptr);
- if (piConsole->GetSortedVars((const char**)&cszVariableNames.front(), nNumberOfVariables, NULL) != nNumberOfVariables)
+ if (piConsole->GetSortedVars((const char**)&cszVariableNames.front(), nNumberOfVariables, nullptr) != nNumberOfVariables)
{
assert(false);
return;
@@ -711,8 +711,8 @@ void CSettingsManager::ReadValueStr(XmlNodeRef& sourceNode, const QString& path,
// Spaces in node names not allowed
readAttr.replace(" ", "");
- XmlNodeRef root = NULL;
- XmlNodeRef tmpNode = NULL;
+ XmlNodeRef root = nullptr;
+ XmlNodeRef tmpNode = nullptr;
if (NeedSettingsNode(path))
{
@@ -809,7 +809,7 @@ bool CSettingsManager::IsEventSafe(const SEventLog& event)
if (!root)
{
- return TRUE;
+ return true;
}
QString eventName = event.m_eventName;
@@ -823,7 +823,7 @@ bool CSettingsManager::IsEventSafe(const SEventLog& event)
// Log entry not found, so it is safe to start
if (!resNode)
{
- return TRUE;
+ return true;
}
XmlNodeRef callerVersion = resNode->findChild(EVENT_LOG_CALLER_VERSION);
@@ -841,15 +841,15 @@ bool CSettingsManager::IsEventSafe(const SEventLog& event)
{
if (callerVersionStr != GetToolVersion(eventName))
{
- return TRUE;
+ return true;
}
}
// The same version of tool/level found
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
//////////////////////////////////////////////////////////////////////////
@@ -947,15 +947,15 @@ XmlNodeRef CSettingsManager::LoadLogEventSetting(const QString& path, const QStr
if (!root)
{
- return 0;
+ return nullptr;
}
- XmlNodeRef tmpNode = NULL;
+ XmlNodeRef tmpNode = nullptr;
tmpNode = root;
if (!tmpNode)
{
- return 0;
+ return nullptr;
}
for (int i = 0; i < strNodes.size(); ++i)
@@ -966,7 +966,7 @@ XmlNodeRef CSettingsManager::LoadLogEventSetting(const QString& path, const QStr
}
else
{
- return 0;
+ return nullptr;
}
}
@@ -975,7 +975,7 @@ XmlNodeRef CSettingsManager::LoadLogEventSetting(const QString& path, const QStr
return tmpNode;
}
- return 0;
+ return nullptr;
}
QString CSettingsManager::GenerateContentHash(XmlNodeRef& node, QString sourceName)
diff --git a/Code/Editor/SettingsManagerDialog.cpp b/Code/Editor/SettingsManagerDialog.cpp
index 3f1c718b38..f8b720ae55 100644
--- a/Code/Editor/SettingsManagerDialog.cpp
+++ b/Code/Editor/SettingsManagerDialog.cpp
@@ -84,7 +84,7 @@ void CSettingsManagerDialog::OnReadBtnClick()
ui->m_layoutListBox->clear();
TToolNamesMap toolNames;
- XmlNodeRef dummyNode = NULL;
+ XmlNodeRef dummyNode = nullptr;
GetIEditor()->GetSettingsManager()->GetMatchingLayoutNames(toolNames, dummyNode, m_importFileStr);
diff --git a/Code/Editor/StartupLogoDialog.cpp b/Code/Editor/StartupLogoDialog.cpp
index 38d733f8df..d9625aff1a 100644
--- a/Code/Editor/StartupLogoDialog.cpp
+++ b/Code/Editor/StartupLogoDialog.cpp
@@ -27,14 +27,14 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
/////////////////////////////////////////////////////////////////////////////
// CStartupLogoDialog dialog
-CStartupLogoDialog* CStartupLogoDialog::s_pLogoWindow = 0;
+CStartupLogoDialog* CStartupLogoDialog::s_pLogoWindow = nullptr;
-CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=NULL*/)
+CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopyrightNotice, QWidget* pParent /*=nullptr*/)
: QWidget(pParent, Qt::Dialog | Qt::FramelessWindowHint)
, m_ui(new Ui::StartupLogoDialog)
{
m_ui->setupUi(this);
-
+
s_pLogoWindow = this;
m_backgroundImage = QPixmap(QStringLiteral(":/StartupLogoDialog/splashscreen_background_developer_preview.jpg"));
@@ -61,7 +61,7 @@ CStartupLogoDialog::CStartupLogoDialog(QString versionText, QString richTextCopy
CStartupLogoDialog::~CStartupLogoDialog()
{
- s_pLogoWindow = 0;
+ s_pLogoWindow = nullptr;
}
void CStartupLogoDialog::SetText(const char* text)
diff --git a/Code/Editor/StringDlg.h b/Code/Editor/StringDlg.h
index a1ee3908c7..e52cd207d1 100644
--- a/Code/Editor/StringDlg.h
+++ b/Code/Editor/StringDlg.h
@@ -25,7 +25,7 @@ typedef bool (StringDlgPredicate)(QString input);
class StringDlg : public QInputDialog
{
public:
- StringDlg(const QString &title, QWidget* pParent = NULL, bool bFileNameLimitation = false);
+ StringDlg(const QString &title, QWidget* pParent = nullptr, bool bFileNameLimitation = false);
void SetCheckCallback(const std::function& Check) {
m_Check = Check;
diff --git a/Code/Editor/ToolBox.cpp b/Code/Editor/ToolBox.cpp
index 82817e1ff7..bac02d7460 100644
--- a/Code/Editor/ToolBox.cpp
+++ b/Code/Editor/ToolBox.cpp
@@ -186,7 +186,7 @@ const CToolBoxMacro* CToolBoxManager::GetMacro(int iIndex, bool bToolbox) const
assert(0 <= iIndex && iIndex < m_shelveMacros.size());
return m_shelveMacros[iIndex];
}
- return NULL;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -202,7 +202,7 @@ CToolBoxMacro* CToolBoxManager::GetMacro(int iIndex, bool bToolbox)
assert(0 <= iIndex && iIndex < m_shelveMacros.size());
return m_shelveMacros[iIndex];
}
- return NULL;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -240,14 +240,14 @@ CToolBoxMacro* CToolBoxManager::NewMacro(const QString& title, bool bToolbox, in
const int macroCount = m_macros.size();
if (macroCount > ID_TOOL_LAST - ID_TOOL_FIRST + 1)
{
- return NULL;
+ return nullptr;
}
for (size_t i = 0; i < macroCount; ++i)
{
if (QString::compare(m_macros[i]->GetTitle(), title, Qt::CaseInsensitive) == 0)
{
- return NULL;
+ return nullptr;
}
}
@@ -264,7 +264,7 @@ CToolBoxMacro* CToolBoxManager::NewMacro(const QString& title, bool bToolbox, in
const int shelveMacroCount = m_shelveMacros.size();
if (shelveMacroCount > ID_TOOL_SHELVE_LAST - ID_TOOL_SHELVE_FIRST + 1)
{
- return NULL;
+ return nullptr;
}
CToolBoxMacro* pNewTool = new CToolBoxMacro(title);
@@ -275,7 +275,7 @@ CToolBoxMacro* CToolBoxManager::NewMacro(const QString& title, bool bToolbox, in
m_shelveMacros.push_back(pNewTool);
return pNewTool;
}
- return NULL;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -333,7 +333,7 @@ void CToolBoxManager::Load([[maybe_unused]] ActionManager* actionManager)
void CToolBoxManager::Load(QString xmlpath, AmazonToolbar* pToolbar, bool bToolbox, ActionManager* actionManager)
{
XmlNodeRef toolBoxNode = XmlHelpers::LoadXmlFromFile(xmlpath.toUtf8().data());
- if (toolBoxNode == NULL)
+ if (toolBoxNode == nullptr)
{
return;
}
diff --git a/Code/Editor/ToolBox.h b/Code/Editor/ToolBox.h
index 0c91305c79..eefc74f791 100644
--- a/Code/Editor/ToolBox.h
+++ b/Code/Editor/ToolBox.h
@@ -137,7 +137,7 @@ public:
CToolBoxMacro* GetMacro(int iIndex, bool bToolbox);
//! Get the index of a macro from its title.
int GetMacroIndex(const QString& title, bool bToolbox) const;
- //! Creates a new macro in the manager. If the title is duplicate, this returns NULL.
+ //! Creates a new macro in the manager. If the title is duplicate, this returns nullptr.
CToolBoxMacro* NewMacro(const QString& title, bool bToolbox, int* newIdx);
//! Try to change the title of a macro. If the title is duplicate, the change is aborted and this returns false.
bool SetMacroTitle(int index, const QString& title, bool bToolbox);
diff --git a/Code/Editor/ToolsConfigPage.cpp b/Code/Editor/ToolsConfigPage.cpp
index a2328550e0..bae70f0cfe 100644
--- a/Code/Editor/ToolsConfigPage.cpp
+++ b/Code/Editor/ToolsConfigPage.cpp
@@ -109,7 +109,7 @@ private:
QStringList m_iconFiles;
};
-CIconListDialog::CIconListDialog(QWidget* pParent /* = NULL */)
+CIconListDialog::CIconListDialog(QWidget* pParent /* = nullptr */)
: QDialog(pParent)
, m_ui(new Ui::IconListDialog)
{
@@ -498,7 +498,7 @@ CToolsConfigPage::CToolsConfigPage(QWidget* parent)
QKeySequence shortcut(value);
m_ui->m_macroShortcutKey->setKeySequence(shortcut);
}
-
+
if (m_ui->m_macroShortcutKey->keySequence().count() >= 1)
{
m_ui->m_assignShortcut->setEnabled(true);
@@ -703,7 +703,7 @@ void CToolsConfigPage::OnAssignMacroShortcut()
{
auto pShortcutMgr = MainWindow::instance()->GetShortcutManager();
- if (pShortcutMgr == NULL)
+ if (pShortcutMgr == nullptr)
{
return;
}
diff --git a/Code/Editor/TrackView/2DBezierKeyUIControls.cpp b/Code/Editor/TrackView/2DBezierKeyUIControls.cpp
index 1709ea2eac..81cd151373 100644
--- a/Code/Editor/TrackView/2DBezierKeyUIControls.cpp
+++ b/Code/Editor/TrackView/2DBezierKeyUIControls.cpp
@@ -26,19 +26,19 @@ public:
CSmartVariableArray mv_table;
CSmartVariable mv_value;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_value, "Value");
}
- bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return trackType == eAnimCurveType_BezierFloat;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 0; }
+ unsigned int GetPriority() const override { return 0; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp b/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp
index a8e24cf58d..038a9d9780 100644
--- a/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp
+++ b/Code/Editor/TrackView/AssetBlendKeyUIControls.cpp
@@ -41,7 +41,7 @@ public:
CSmartVariable mv_blendInTime;
CSmartVariable mv_blendOutTime;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
// Init to an invalid id
AZ::Data::AssetId assetId;
@@ -62,15 +62,15 @@ public:
mv_timeScale->SetLimits(0.001f, 100.f);
}
- bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
+ bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const override
{
return valueType == AnimValueType::AssetBlend;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/CaptureKeyUIControls.cpp b/Code/Editor/TrackView/CaptureKeyUIControls.cpp
index 821066d4a3..e6d88a6cd6 100644
--- a/Code/Editor/TrackView/CaptureKeyUIControls.cpp
+++ b/Code/Editor/TrackView/CaptureKeyUIControls.cpp
@@ -27,7 +27,7 @@ public:
CSmartVariable mv_folder;
CSmartVariable mv_once;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
mv_duration.GetVar()->SetLimits(0, 100000.0f);
mv_timeStep.GetVar()->SetLimits(0.001f, 1.0f);
@@ -39,14 +39,14 @@ public:
AddVariable(mv_table, mv_folder, "Output Folder");
AddVariable(mv_table, mv_once, "Just one frame?");
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::Capture;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/CharacterKeyUIControls.cpp b/Code/Editor/TrackView/CharacterKeyUIControls.cpp
index 9ff41f1275..24bfd9f680 100644
--- a/Code/Editor/TrackView/CharacterKeyUIControls.cpp
+++ b/Code/Editor/TrackView/CharacterKeyUIControls.cpp
@@ -33,7 +33,7 @@ public:
CSmartVariable mv_endTime;
CSmartVariable mv_timeScale;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_animation, "Animation", IVariable::DT_ANIMATION);
@@ -45,14 +45,14 @@ public:
AddVariable(mv_table, mv_timeScale, "Time Scale");
mv_timeScale->SetLimits(0.001f, 100.f);
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const override
{
return paramType == AnimParamType::Animation || valueType == AnimValueType::CharacterAnim;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/CommentKeyUIControls.cpp b/Code/Editor/TrackView/CommentKeyUIControls.cpp
index 4c5dc10bfa..b5a706c843 100644
--- a/Code/Editor/TrackView/CommentKeyUIControls.cpp
+++ b/Code/Editor/TrackView/CommentKeyUIControls.cpp
@@ -30,7 +30,7 @@ public:
CSmartVariableEnum mv_font;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_comment, "Comment");
@@ -41,13 +41,13 @@ public:
AddVariable(mv_table, mv_color, "Color", IVariable::DT_COLOR);
- mv_align->SetEnumList(NULL);
+ mv_align->SetEnumList(nullptr);
mv_align->AddEnumItem("Left", ICommentKey::eTA_Left);
mv_align->AddEnumItem("Center", ICommentKey::eTA_Center);
mv_align->AddEnumItem("Right", ICommentKey::eTA_Right);
AddVariable(mv_table, mv_align, "Align");
- mv_font->SetEnumList(NULL);
+ mv_font->SetEnumList(nullptr);
IFileUtil::FileArray fa;
CFileUtil::ScanDirectory((Path::GetEditingGameDataFolder() + "/Fonts/").c_str(), "*.xml", fa, true);
for (size_t i = 0; i < fa.size(); ++i)
@@ -58,14 +58,14 @@ public:
}
AddVariable(mv_table, mv_font, "Font");
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::CommentText;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/CommentNodeAnimator.cpp b/Code/Editor/TrackView/CommentNodeAnimator.cpp
index ee01656938..bb60259203 100644
--- a/Code/Editor/TrackView/CommentNodeAnimator.cpp
+++ b/Code/Editor/TrackView/CommentNodeAnimator.cpp
@@ -26,7 +26,7 @@ CCommentNodeAnimator::CCommentNodeAnimator(CTrackViewAnimNode* pCommentNode)
CCommentNodeAnimator::~CCommentNodeAnimator()
{
- m_pCommentNode = 0;
+ m_pCommentNode = nullptr;
}
void CCommentNodeAnimator::Animate(CTrackViewAnimNode* pNode, const SAnimContext& ac)
diff --git a/Code/Editor/TrackView/ConsoleKeyUIControls.cpp b/Code/Editor/TrackView/ConsoleKeyUIControls.cpp
index cbf22f63e6..7bf23e0b52 100644
--- a/Code/Editor/TrackView/ConsoleKeyUIControls.cpp
+++ b/Code/Editor/TrackView/ConsoleKeyUIControls.cpp
@@ -24,19 +24,19 @@ public:
CSmartVariableArray mv_table;
CSmartVariable mv_command;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_command, "Command");
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::Console;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/EventKeyUIControls.cpp b/Code/Editor/TrackView/EventKeyUIControls.cpp
index a45e59dc1a..56b16d7c02 100644
--- a/Code/Editor/TrackView/EventKeyUIControls.cpp
+++ b/Code/Editor/TrackView/EventKeyUIControls.cpp
@@ -26,7 +26,7 @@ public:
CSmartVariable mv_value;
CSmartVariable mv_notrigger_in_scrubbing;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_event, "Event");
@@ -35,14 +35,14 @@ public:
AddVariable(mv_deprecated, "Deprecated");
AddVariable(mv_deprecated, mv_animation, "Animation");
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::Event;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
@@ -73,8 +73,8 @@ bool CEventKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys
CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
if (paramType == AnimParamType::Event)
{
- mv_event.SetEnumList(NULL);
- mv_animation.SetEnumList(NULL);
+ mv_event.SetEnumList(nullptr);
+ mv_animation.SetEnumList(nullptr);
// Add for empty, unset event
mv_event->AddEnumItem(QObject::tr(""), "");
diff --git a/Code/Editor/TrackView/GotoKeyUIControls.cpp b/Code/Editor/TrackView/GotoKeyUIControls.cpp
index 6435745d2a..c48ce4c5ad 100644
--- a/Code/Editor/TrackView/GotoKeyUIControls.cpp
+++ b/Code/Editor/TrackView/GotoKeyUIControls.cpp
@@ -24,12 +24,12 @@ public:
CSmartVariableArray mv_table;
CSmartVariable mv_command;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_command, "Goto Time");
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
if (paramType == AnimParamType::Goto)
{
@@ -40,10 +40,10 @@ public:
return false;
}
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp b/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
index 786016cb37..a62ab17cbf 100644
--- a/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
+++ b/Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
@@ -33,23 +33,23 @@ class CScreenFaderKeyUIControls
public:
//-----------------------------------------------------------------------------
//!
- virtual bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::ScreenFader;
}
//-----------------------------------------------------------------------------
//!
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
- mv_fadeType->SetEnumList(NULL);
+ mv_fadeType->SetEnumList(nullptr);
mv_fadeType->AddEnumItem("FadeIn", IScreenFaderKey::eFT_FadeIn);
mv_fadeType->AddEnumItem("FadeOut", IScreenFaderKey::eFT_FadeOut);
AddVariable(mv_table, mv_fadeType, "Type");
- mv_fadechangeType->SetEnumList(NULL);
+ mv_fadechangeType->SetEnumList(nullptr);
mv_fadechangeType->AddEnumItem("Linear", IScreenFaderKey::eFCT_Linear);
mv_fadechangeType->AddEnumItem("Square", IScreenFaderKey::eFCT_Square);
mv_fadechangeType->AddEnumItem("Cubic Square", IScreenFaderKey::eFCT_CubicSquare);
@@ -67,13 +67,13 @@ public:
//-----------------------------------------------------------------------------
//!
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& keys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& keys) override;
//-----------------------------------------------------------------------------
//!
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& keys);
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& keys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/SelectKeyUIControls.cpp b/Code/Editor/TrackView/SelectKeyUIControls.cpp
index 37acf105f3..d12f449c73 100644
--- a/Code/Editor/TrackView/SelectKeyUIControls.cpp
+++ b/Code/Editor/TrackView/SelectKeyUIControls.cpp
@@ -22,7 +22,7 @@ class CSelectKeyUIControls
, protected AZ::EntitySystemBus::Handler
{
public:
- CSelectKeyUIControls() {}
+ CSelectKeyUIControls() = default;
~CSelectKeyUIControls() override;
@@ -30,7 +30,7 @@ public:
CSmartVariableEnum mv_camera;
CSmartVariable mv_BlendTime;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_camera, "Camera");
@@ -39,14 +39,14 @@ public:
Camera::CameraNotificationBus::Handler::BusConnect();
AZ::EntitySystemBus::Handler::BusConnect();
}
- bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const
+ bool SupportTrackType([[maybe_unused]] const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, AnimValueType valueType) const override
{
return valueType == AnimValueType::Select;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
@@ -98,7 +98,7 @@ bool CSelectKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedKey
ResetCameraEntries();
// Get All cameras.
- mv_camera.SetEnumList(NULL);
+ mv_camera.SetEnumList(nullptr);
mv_camera->AddEnumItem(QObject::tr(""), QString::number(static_cast(AZ::EntityId::InvalidEntityId)));
@@ -217,7 +217,7 @@ void CSelectKeyUIControls::OnCameraRemoved(const AZ::EntityId & cameraId)
// We can't iterate or remove an item from the enum list, and Camera::CameraRequests::GetCameras
// still includes the deleted camera at this point. Reset the list anyway and filter out the
// deleted camera.
- mv_camera->SetEnumList(NULL);
+ mv_camera->SetEnumList(nullptr);
mv_camera->AddEnumItem(QObject::tr(""), QString::number(static_cast(AZ::EntityId::InvalidEntityId)));
AZ::EBusAggregateResults cameraComponentEntities;
@@ -256,7 +256,7 @@ void CSelectKeyUIControls::OnEntityNameChanged(const AZ::EntityId & entityId, [[
void CSelectKeyUIControls::ResetCameraEntries()
{
- mv_camera.SetEnumList(NULL);
+ mv_camera.SetEnumList(nullptr);
mv_camera->AddEnumItem(QObject::tr(""), QString::number(static_cast(AZ::EntityId::InvalidEntityId)));
// Find all Component Entity Cameras
diff --git a/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp b/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
index 4f06e3cc84..66c4f63d35 100644
--- a/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
+++ b/Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
@@ -122,8 +122,7 @@ CSequenceBatchRenderDialog::CSequenceBatchRenderDialog(float fps, QWidget* pPare
}
CSequenceBatchRenderDialog::~CSequenceBatchRenderDialog()
-{
-}
+= default;
void CSequenceBatchRenderDialog::reject()
{
@@ -524,7 +523,7 @@ void CSequenceBatchRenderDialog::OnGo()
InitializeContext();
// Trigger the first item.
- OnMovieEvent(IMovieListener::eMovieEvent_Stopped, NULL);
+ OnMovieEvent(IMovieListener::eMovieEvent_Stopped, nullptr);
}
}
@@ -733,7 +732,7 @@ bool CSequenceBatchRenderDialog::GetResolutionFromCustomResText(const char* cust
bool CSequenceBatchRenderDialog::LoadOutputOptions(const QString& pathname)
{
XmlNodeRef batchRenderOptionsNode = XmlHelpers::LoadXmlFromFile(pathname.toStdString().c_str());
- if (batchRenderOptionsNode == NULL)
+ if (batchRenderOptionsNode == nullptr)
{
return true;
}
@@ -1399,7 +1398,7 @@ void CSequenceBatchRenderDialog::OnLoadBatch()
Path::GetUserSandboxFolder(), loadPath))
{
XmlNodeRef batchRenderListNode = XmlHelpers::LoadXmlFromFile(loadPath.toStdString().c_str());
- if (batchRenderListNode == NULL)
+ if (batchRenderListNode == nullptr)
{
return;
}
@@ -1422,7 +1421,7 @@ void CSequenceBatchRenderDialog::OnLoadBatch()
// sequence
const QString seqName = itemNode->getAttr("sequence");
item.pSequence = GetIEditor()->GetMovieSystem()->FindLegacySequenceByName(seqName.toUtf8().data());
- if (item.pSequence == NULL)
+ if (item.pSequence == nullptr)
{
QMessageBox::warning(this, tr("Sequence not found"), tr("A sequence of '%1' not found! This'll be skipped.").arg(seqName));
continue;
@@ -1439,7 +1438,7 @@ void CSequenceBatchRenderDialog::OnLoadBatch()
break;
}
}
- if (item.pDirectorNode == NULL)
+ if (item.pDirectorNode == nullptr)
{
QMessageBox::warning(this, tr("Director node not found"), tr("A director node of '%1' not found in the sequence of '%2'! This'll be skipped.").arg(directorName).arg(seqName));
continue;
@@ -1552,7 +1551,7 @@ bool CSequenceBatchRenderDialog::SetUpNewRenderItem(SRenderItem& item)
break;
}
}
- if (item.pDirectorNode == NULL)
+ if (item.pDirectorNode == nullptr)
{
return false;
}
diff --git a/Code/Editor/TrackView/SequenceBatchRenderDialog.h b/Code/Editor/TrackView/SequenceBatchRenderDialog.h
index 2d2097fa7a..5d8934f783 100644
--- a/Code/Editor/TrackView/SequenceBatchRenderDialog.h
+++ b/Code/Editor/TrackView/SequenceBatchRenderDialog.h
@@ -81,8 +81,8 @@ protected:
bool disableDebugInfo;
bool bCreateVideo;
SRenderItem()
- : pSequence(NULL)
- , pDirectorNode(NULL)
+ : pSequence(nullptr)
+ , pDirectorNode(nullptr)
, disableDebugInfo(false)
, bCreateVideo(false) {}
bool operator==(const SRenderItem& item)
@@ -155,7 +155,7 @@ protected:
, expectedTotalTime(0)
, spentTime(0)
, flagBU(0)
- , pActiveDirectorBU(NULL)
+ , pActiveDirectorBU(nullptr)
, cvarCustomResWidthBU(0)
, cvarCustomResHeightBU(0)
, cvarDisplayInfoBU(0)
diff --git a/Code/Editor/TrackView/SequenceKeyUIControls.cpp b/Code/Editor/TrackView/SequenceKeyUIControls.cpp
index 5ef5a9c4ab..7889b30848 100644
--- a/Code/Editor/TrackView/SequenceKeyUIControls.cpp
+++ b/Code/Editor/TrackView/SequenceKeyUIControls.cpp
@@ -27,7 +27,7 @@ public:
CSmartVariable mv_startTime;
CSmartVariable mv_endTime;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_sequence, "Sequence");
@@ -35,14 +35,14 @@ public:
AddVariable(mv_table, mv_startTime, "Start Time");
AddVariable(mv_table, mv_endTime, "End Time");
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::Sequence;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
@@ -78,7 +78,7 @@ bool CSequenceKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedK
/////////////////////////////////////////////////////////////////////////////////
// fill sequence comboBox with available sequences
- mv_sequence.SetEnumList(NULL);
+ mv_sequence.SetEnumList(nullptr);
// Insert '' empty enum
mv_sequence->AddEnumItem(QObject::tr(""), CTrackViewDialog::GetEntityIdAsString(AZ::EntityId(AZ::EntityId::InvalidEntityId)));
@@ -193,7 +193,7 @@ void CSequenceKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& se
IMovieSystem* pMovieSystem = GetIEditor()->GetSystem()->GetIMovieSystem();
- if (pMovieSystem != NULL)
+ if (pMovieSystem != nullptr)
{
pMovieSystem->SetStartEndTime(pSequence, sequenceKey.fStartTime, sequenceKey.fEndTime);
}
diff --git a/Code/Editor/TrackView/SoundKeyUIControls.cpp b/Code/Editor/TrackView/SoundKeyUIControls.cpp
index ff6b558abf..8c18b58aed 100644
--- a/Code/Editor/TrackView/SoundKeyUIControls.cpp
+++ b/Code/Editor/TrackView/SoundKeyUIControls.cpp
@@ -29,7 +29,7 @@ public:
CSmartVariable mv_duration;
CSmartVariable mv_customColor;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_startTrigger, "StartTrigger", IVariable::DT_AUDIO_TRIGGER);
@@ -38,14 +38,14 @@ public:
AddVariable(mv_options, "Options");
AddVariable(mv_options, mv_customColor, "Custom Color", IVariable::DT_COLOR);
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::Sound;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
index e03b013720..e2f8a4f7a2 100644
--- a/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
+++ b/Code/Editor/TrackView/TVCustomizeTrackColorsDlg.cpp
@@ -344,7 +344,7 @@ void CTVCustomizeTrackColorsDlg::Export(const QString& fullPath) const
bool CTVCustomizeTrackColorsDlg::Import(const QString& fullPath)
{
XmlNodeRef customTrackColorsNode = XmlHelpers::LoadXmlFromFile(fullPath.toStdString().c_str());
- if (customTrackColorsNode == NULL)
+ if (customTrackColorsNode == nullptr)
{
return false;
}
diff --git a/Code/Editor/TrackView/TVEventsDialog.cpp b/Code/Editor/TrackView/TVEventsDialog.cpp
index a89c0aac2a..c8221b38cd 100644
--- a/Code/Editor/TrackView/TVEventsDialog.cpp
+++ b/Code/Editor/TrackView/TVEventsDialog.cpp
@@ -211,7 +211,7 @@ public:
int GetNumberOfUsageAndFirstTimeUsed(const char* eventName, float& timeFirstUsed) const;
};
-CTVEventsDialog::CTVEventsDialog(QWidget* pParent /*=NULL*/)
+CTVEventsDialog::CTVEventsDialog(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_ui(new Ui::TVEventsDialog)
{
diff --git a/Code/Editor/TrackView/TVSequenceProps.cpp b/Code/Editor/TrackView/TVSequenceProps.cpp
index 3a0fab2f2c..1ac31d7e2b 100644
--- a/Code/Editor/TrackView/TVSequenceProps.cpp
+++ b/Code/Editor/TrackView/TVSequenceProps.cpp
@@ -51,7 +51,7 @@ CTVSequenceProps::~CTVSequenceProps()
}
// CTVSequenceProps message handlers
-BOOL CTVSequenceProps::OnInitDialog()
+bool CTVSequenceProps::OnInitDialog()
{
ui->NAME->setText(m_pSequence->GetName());
int seqFlags = m_pSequence->GetFlags();
@@ -97,7 +97,7 @@ BOOL CTVSequenceProps::OnInitDialog()
ui->ORT_ONCE->setChecked(true);
}
- return TRUE; // return TRUE unless you set the focus to a control
+ return true; // return true unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
@@ -259,7 +259,7 @@ void CTVSequenceProps::OnOK()
void CTVSequenceProps::ToggleCutsceneOptions(bool bActivated)
{
- if (bActivated == FALSE)
+ if (bActivated == false)
{
ui->NOABORT->setChecked(false);
ui->DISABLEPLAYER->setChecked(false);
diff --git a/Code/Editor/TrackView/TVSequenceProps.h b/Code/Editor/TrackView/TVSequenceProps.h
index f12c245c57..b54208e429 100644
--- a/Code/Editor/TrackView/TVSequenceProps.h
+++ b/Code/Editor/TrackView/TVSequenceProps.h
@@ -28,7 +28,7 @@ class CTVSequenceProps
{
Q_OBJECT
public:
- CTVSequenceProps(CTrackViewSequence* pSequence, float fps, QWidget* pParent = NULL); // standard constructor
+ CTVSequenceProps(CTrackViewSequence* pSequence, float fps, QWidget* pParent = nullptr); // standard constructor
~CTVSequenceProps();
private:
@@ -39,7 +39,7 @@ private:
};
CTrackViewSequence* m_pSequence;
- virtual BOOL OnInitDialog();
+ virtual bool OnInitDialog();
virtual void OnOK();
void MoveScaleKeys();
diff --git a/Code/Editor/TrackView/TimeRangeKeyUIControls.cpp b/Code/Editor/TrackView/TimeRangeKeyUIControls.cpp
index bd771e3849..e35c18329b 100644
--- a/Code/Editor/TrackView/TimeRangeKeyUIControls.cpp
+++ b/Code/Editor/TrackView/TimeRangeKeyUIControls.cpp
@@ -27,7 +27,7 @@ public:
CSmartVariable mv_timeScale;
CSmartVariable mv_bLoop;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_startTime, "Start Time");
@@ -36,14 +36,14 @@ public:
AddVariable(mv_table, mv_bLoop, "Loop");
mv_timeScale->SetLimits(0.001f, 100.f);
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::TimeRanges;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
diff --git a/Code/Editor/TrackView/TrackEventKeyUIControls.cpp b/Code/Editor/TrackView/TrackEventKeyUIControls.cpp
index 934820ede1..035087733b 100644
--- a/Code/Editor/TrackView/TrackEventKeyUIControls.cpp
+++ b/Code/Editor/TrackView/TrackEventKeyUIControls.cpp
@@ -26,21 +26,21 @@ public:
CSmartVariableEnum mv_event;
CSmartVariable mv_value;
- virtual void OnCreateVars()
+ void OnCreateVars() override
{
AddVariable(mv_table, "Key Properties");
AddVariable(mv_table, mv_event, "Track Event");
mv_event->SetFlags(mv_event->GetFlags() | IVariable::UI_UNSORTED);
AddVariable(mv_table, mv_value, "Value");
}
- bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const
+ bool SupportTrackType(const CAnimParamType& paramType, [[maybe_unused]] EAnimCurveType trackType, [[maybe_unused]] AnimValueType valueType) const override
{
return paramType == AnimParamType::TrackEvent;
}
- virtual bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys);
- virtual void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys);
+ bool OnKeySelectionChange(CTrackViewKeyBundle& selectedKeys) override;
+ void OnUIChange(IVariable* pVar, CTrackViewKeyBundle& selectedKeys) override;
- virtual unsigned int GetPriority() const { return 1; }
+ unsigned int GetPriority() const override { return 1; }
static const GUID& GetClassID()
{
@@ -182,7 +182,7 @@ void CTrackEventKeyUIControls::BuildEventDropDown(QString& curEvent, const QStri
{
bool curEventExists = false;
bool addedEventExists = false;
- mv_event.SetEnumList(NULL);
+ mv_event.SetEnumList(nullptr);
const int eventCount = sequence->GetTrackEventsCount();
// Need to check if event exists before adding all events
diff --git a/Code/Editor/TrackView/TrackViewAnimNode.cpp b/Code/Editor/TrackView/TrackViewAnimNode.cpp
index 9d0892888f..685cdc528e 100644
--- a/Code/Editor/TrackView/TrackViewAnimNode.cpp
+++ b/Code/Editor/TrackView/TrackViewAnimNode.cpp
@@ -370,7 +370,7 @@ bool CTrackViewAnimNode::IsBoundToEditorObjects() const
else
{
// check if bound to legacy entity
- return (m_animNode->GetNodeOwner() != NULL);
+ return (m_animNode->GetNodeOwner() != nullptr);
}
}
@@ -1468,7 +1468,7 @@ bool CTrackViewAnimNode::PasteNodesFromClipboard(QWidget* context)
}
XmlNodeRef animNodesRoot = clipboard.Get();
- if (animNodesRoot == NULL || strcmp(animNodesRoot->getTag(), "CopyAnimNodesRoot") != 0)
+ if (animNodesRoot == nullptr || strcmp(animNodesRoot->getTag(), "CopyAnimNodesRoot") != 0)
{
return false;
}
diff --git a/Code/Editor/TrackView/TrackViewAnimNode.h b/Code/Editor/TrackView/TrackViewAnimNode.h
index 475307ffa9..466e60bcf0 100644
--- a/Code/Editor/TrackView/TrackViewAnimNode.h
+++ b/Code/Editor/TrackView/TrackViewAnimNode.h
@@ -27,7 +27,7 @@ class QWidget;
class CTrackViewAnimNodeBundle
{
public:
- unsigned int GetCount() const { return m_animNodes.size(); }
+ unsigned int GetCount() const { return static_cast(m_animNodes.size()); }
CTrackViewAnimNode* GetNode(const unsigned int index) { return m_animNodes[index]; }
const CTrackViewAnimNode* GetNode(const unsigned int index) const { return m_animNodes[index]; }
diff --git a/Code/Editor/TrackView/TrackViewDialog.cpp b/Code/Editor/TrackView/TrackViewDialog.cpp
index 9a35f09911..331daf6730 100644
--- a/Code/Editor/TrackView/TrackViewDialog.cpp
+++ b/Code/Editor/TrackView/TrackViewDialog.cpp
@@ -130,10 +130,10 @@ const GUID& CTrackViewDialog::GetClassID()
//////////////////////////////////////////////////////////////////////////
-CTrackViewDialog* CTrackViewDialog::s_pTrackViewDialog = NULL;
+CTrackViewDialog* CTrackViewDialog::s_pTrackViewDialog = nullptr;
//////////////////////////////////////////////////////////////////////////
-CTrackViewDialog::CTrackViewDialog(QWidget* pParent /*=NULL*/)
+CTrackViewDialog::CTrackViewDialog(QWidget* pParent /*=nullptr*/)
: QMainWindow(pParent)
{
s_pTrackViewDialog = this;
@@ -152,7 +152,7 @@ CTrackViewDialog::CTrackViewDialog(QWidget* pParent /*=NULL*/)
m_lazyInitDone = false;
m_bEditLock = false;
- m_pNodeForTracksToolBar = NULL;
+ m_pNodeForTracksToolBar = nullptr;
m_currentToolBarParamTypeId = 0;
@@ -181,7 +181,7 @@ CTrackViewDialog::~CTrackViewDialog()
m_findDlg->deleteLater();
m_findDlg = nullptr;
}
- s_pTrackViewDialog = 0;
+ s_pTrackViewDialog = nullptr;
const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_currentSequenceEntityId);
@@ -210,7 +210,7 @@ void CTrackViewDialog::OnAddEntityNodeMenu()
}
//////////////////////////////////////////////////////////////////////////
-BOOL CTrackViewDialog::OnInitDialog()
+bool CTrackViewDialog::OnInitDialog()
{
InitToolbar();
InitMenu();
@@ -270,7 +270,7 @@ BOOL CTrackViewDialog::OnInitDialog()
QString cursorPosText = QString("0.000(%1fps)").arg(FloatToIntRet(m_wndCurveEditor->GetFPS()));
m_cursorPos->setText(cursorPosText);
- return TRUE; // return TRUE unless you set the focus to a control
+ return true; // return true unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
}
@@ -621,7 +621,7 @@ void CTrackViewDialog::InitToolbar()
{
qaction2->setCheckable(true);
}
-
+
m_actions[ID_TV_SNAP_NONE]->setChecked(true);
m_tracksToolBar = addToolBar("Tracks Toolbar");
@@ -883,7 +883,7 @@ void CTrackViewDialog::Update()
// The active camera node means two conditions:
// 1. Sequence camera is currently active.
// 2. The camera which owns this node has been set as the current camera by the director node.
- bool bSequenceCamInUse = gEnv->pMovieSystem->GetCallback() == NULL ||
+ bool bSequenceCamInUse = gEnv->pMovieSystem->GetCallback() == nullptr ||
gEnv->pMovieSystem->GetCallback()->IsSequenceCamUsed();
AZ::EntityId camId = gEnv->pMovieSystem->GetCameraParams().cameraEntityId;
if (camId.IsValid() && bSequenceCamInUse)
@@ -2049,7 +2049,7 @@ void CTrackViewDialog::ClearTracksToolBar()
m_tracksToolBar->clear();
m_tracksToolBar->addWidget(new QLabel("Tracks:"));
- m_pNodeForTracksToolBar = NULL;
+ m_pNodeForTracksToolBar = nullptr;
m_toolBarParamTypes.clear();
m_currentToolBarParamTypeId = 0;
}
diff --git a/Code/Editor/TrackView/TrackViewDialog.h b/Code/Editor/TrackView/TrackViewDialog.h
index f30d9a414f..f6c1126713 100644
--- a/Code/Editor/TrackView/TrackViewDialog.h
+++ b/Code/Editor/TrackView/TrackViewDialog.h
@@ -52,7 +52,7 @@ class CTrackViewDialog
public:
friend CMovieCallback;
- CTrackViewDialog(QWidget* pParent = NULL);
+ CTrackViewDialog(QWidget* pParent = nullptr);
~CTrackViewDialog();
static void RegisterViewClass();
@@ -183,7 +183,7 @@ private:
void OnAddEntityNodeMenu();
void OnEditorNotifyEvent(EEditorNotifyEvent event) override;
- BOOL OnInitDialog();
+ bool OnInitDialog();
void SaveLayouts();
void SaveMiscSettings() const;
diff --git a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
index 34ca2f062f..accba34422 100644
--- a/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
+++ b/Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
@@ -88,7 +88,7 @@ CTrackViewDopeSheetBase::CTrackViewDopeSheetBase(QWidget* parent)
m_currentTime = 0.0f;
m_storedTime = m_currentTime;
m_rcSelect = QRect(0, 0, 0, 0);
- m_rubberBand = 0;
+ m_rubberBand = nullptr;
m_scrollBar = new QScrollBar(Qt::Horizontal, this);
connect(m_scrollBar, &QScrollBar::valueChanged, this, &CTrackViewDopeSheetBase::OnHScroll);
m_keyTimeOffset = 0;
@@ -113,7 +113,7 @@ CTrackViewDopeSheetBase::CTrackViewDopeSheetBase(QWidget* parent)
m_bFastRedraw = false;
- m_pLastTrackSelectedOnSpot = NULL;
+ m_pLastTrackSelectedOnSpot = nullptr;
m_wndPropsOnSpot = nullptr;
@@ -544,7 +544,7 @@ void CTrackViewDopeSheetBase::OnLButtonUp(Qt::KeyboardModifiers modifiers, const
SelectKeys(m_rcSelect, modifiers & Qt::ControlModifier);
m_rcSelect = QRect();
m_rubberBand->deleteLater();
- m_rubberBand = 0;
+ m_rubberBand = nullptr;
}
else if (m_mouseMode == eTVMouseMode_SelectWithinTime)
{
@@ -552,7 +552,7 @@ void CTrackViewDopeSheetBase::OnLButtonUp(Qt::KeyboardModifiers modifiers, const
SelectAllKeysWithinTimeFrame(m_rcSelect, modifiers & Qt::ControlModifier);
m_rcSelect = QRect();
m_rubberBand->deleteLater();
- m_rubberBand = 0;
+ m_rubberBand = nullptr;
}
else if (m_mouseMode == eTVMouseMode_DragTime)
{
@@ -744,7 +744,7 @@ void CTrackViewDopeSheetBase::OnRButtonDown(Qt::KeyboardModifiers modifiers, con
}
else
{
- m_pLastTrackSelectedOnSpot = NULL;
+ m_pLastTrackSelectedOnSpot = nullptr;
}
ShowKeyPropertyCtrlOnSpot(p.x(), p.y(), selectedKeys.GetKeyCount() > 1, bKeyChangeInSameTrack);
@@ -783,7 +783,7 @@ void CTrackViewDopeSheetBase::OnRButtonUp([[maybe_unused]] Qt::KeyboardModifiers
if (!m_bCursorWasInKey)
{
- const bool bHasCopiedKey = (GetKeysInClickboard() != NULL);
+ const bool bHasCopiedKey = (GetKeysInClickboard() != nullptr);
if (bHasCopiedKey && m_bMouseMovedAfterRButtonDown == false) // Once moved, it means the user wanted to scroll, so no paste pop-up.
{
@@ -1230,24 +1230,24 @@ XmlNodeRef CTrackViewDopeSheetBase::GetKeysInClickboard()
CClipboard clip(this);
if (clip.IsEmpty())
{
- return NULL;
+ return nullptr;
}
if (clip.GetTitle() != "Track view keys")
{
- return NULL;
+ return nullptr;
}
XmlNodeRef copyNode = clip.Get();
- if (copyNode == NULL || strcmp(copyNode->getTag(), "CopyKeysNode"))
+ if (copyNode == nullptr || strcmp(copyNode->getTag(), "CopyKeysNode"))
{
- return NULL;
+ return nullptr;
}
int nNumTracksToPaste = copyNode->getChildCount();
if (nNumTracksToPaste == 0)
{
- return NULL;
+ return nullptr;
}
return copyNode;
@@ -1789,7 +1789,7 @@ float CTrackViewDopeSheetBase::FrameSnap(float time) const
//////////////////////////////////////////////////////////////////////////
void CTrackViewDopeSheetBase::ShowKeyPropertyCtrlOnSpot(int x, int y, [[maybe_unused]] bool bMultipleKeysSelected, bool bKeyChangeInSameTrack)
{
- if (m_keyPropertiesDlg == NULL)
+ if (m_keyPropertiesDlg == nullptr)
{
return;
}
diff --git a/Code/Editor/TrackView/TrackViewFindDlg.cpp b/Code/Editor/TrackView/TrackViewFindDlg.cpp
index 3d6e93fb05..014618a62a 100644
--- a/Code/Editor/TrackView/TrackViewFindDlg.cpp
+++ b/Code/Editor/TrackView/TrackViewFindDlg.cpp
@@ -24,13 +24,13 @@ AZ_POP_DISABLE_DLL_EXPORT_MEMBER_WARNING
// CTrackViewFindDlg dialog
-CTrackViewFindDlg::CTrackViewFindDlg(const char* title, QWidget* pParent /*=NULL*/)
+CTrackViewFindDlg::CTrackViewFindDlg(const char* title, QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, ui(new Ui::TrackViewFindDlg)
{
setWindowTitle(title);
- m_tvDlg = 0;
+ m_tvDlg = nullptr;
m_numSeqs = 0;
ui->setupUi(this);
diff --git a/Code/Editor/TrackView/TrackViewFindDlg.h b/Code/Editor/TrackView/TrackViewFindDlg.h
index 65723634e4..8a3239087d 100644
--- a/Code/Editor/TrackView/TrackViewFindDlg.h
+++ b/Code/Editor/TrackView/TrackViewFindDlg.h
@@ -32,7 +32,7 @@ class CTrackViewFindDlg
Q_OBJECT
// Construction
public:
- CTrackViewFindDlg(const char* title = NULL, QWidget* pParent = NULL); // standard constructor
+ CTrackViewFindDlg(const char* title = nullptr, QWidget* pParent = nullptr); // standard constructor
~CTrackViewFindDlg();
//Functions
diff --git a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
index 158052eb2a..6a5c5b6427 100644
--- a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
+++ b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.cpp
@@ -328,8 +328,8 @@ bool CTrackViewTrackPropsDlg::OnKeySelectionChange(CTrackViewKeyBundle& selected
}
else
{
- ui->PREVNEXT->setEnabled(FALSE);
- ui->TIME->setEnabled(FALSE);
+ ui->PREVNEXT->setEnabled(false);
+ ui->TIME->setEnabled(false);
}
return true;
}
diff --git a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h
index d4670a95c8..9b9a933b49 100644
--- a/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h
+++ b/Code/Editor/TrackView/TrackViewKeyPropertiesDlg.h
@@ -74,7 +74,7 @@ protected:
// Helper functions.
//////////////////////////////////////////////////////////////////////////
template
- void SyncValue(CSmartVariable& var, T& value, bool bCopyToUI, IVariable* pSrcVar = NULL)
+ void SyncValue(CSmartVariable& var, T& value, bool bCopyToUI, IVariable* pSrcVar = nullptr)
{
if (bCopyToUI)
{
diff --git a/Code/Editor/TrackView/TrackViewNode.h b/Code/Editor/TrackView/TrackViewNode.h
index 600a66877f..2c289049e9 100644
--- a/Code/Editor/TrackView/TrackViewNode.h
+++ b/Code/Editor/TrackView/TrackViewNode.h
@@ -123,7 +123,7 @@ public:
virtual bool AreAllKeysOfSameType() const override { return m_bAllOfSameType; }
- virtual unsigned int GetKeyCount() const override { return m_keys.size(); }
+ virtual unsigned int GetKeyCount() const override { return static_cast(m_keys.size()); }
virtual CTrackViewKeyHandle GetKey(unsigned int index) override { return m_keys[index]; }
virtual void SelectKeys(const bool bSelected) override;
@@ -174,7 +174,7 @@ public:
CTrackViewNode* GetParentNode() const { return m_pParentNode; }
// Children
- unsigned int GetChildCount() const { return m_childNodes.size(); }
+ unsigned int GetChildCount() const { return static_cast(m_childNodes.size()); }
CTrackViewNode* GetChild(unsigned int index) const { return m_childNodes[index].get(); }
// Snap time value to prev/next key in sequence
diff --git a/Code/Editor/TrackView/TrackViewNodes.cpp b/Code/Editor/TrackView/TrackViewNodes.cpp
index d69c256049..daf99990a8 100644
--- a/Code/Editor/TrackView/TrackViewNodes.cpp
+++ b/Code/Editor/TrackView/TrackViewNodes.cpp
@@ -69,7 +69,7 @@ public:
: QStyledItemDelegate(parent)
{}
- void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+ void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override
{
bool enabled = index.data(CTrackViewNodesCtrl::CRecord::EnableRole).toBool();
QStyleOptionViewItem opt = option;
@@ -106,7 +106,7 @@ protected:
return Qt::CopyAction | Qt::MoveAction;
}
- void dragMoveEvent(QDragMoveEvent* event)
+ void dragMoveEvent(QDragMoveEvent* event) override
{
CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
if (!record)
@@ -144,7 +144,7 @@ protected:
}
}
- void dropEvent(QDropEvent* event)
+ void dropEvent(QDropEvent* event) override
{
CTrackViewNodesCtrl::CRecord* record = (CTrackViewNodesCtrl::CRecord*) itemAt(event->pos());
if (!record)
@@ -200,7 +200,7 @@ protected:
}
}
- void keyPressEvent(QKeyEvent* event)
+ void keyPressEvent(QKeyEvent* event) override
{
// HAVE TO INCLUDE CASES FOR THESE IN THE ShortcutOverride handler in ::event() below
switch (event->key())
@@ -242,7 +242,7 @@ protected:
}
- bool focusNextPrevChild([[maybe_unused]] bool next)
+ bool focusNextPrevChild([[maybe_unused]] bool next) override
{
return false; // so we get the tab key
}
@@ -361,7 +361,7 @@ CTrackViewNodesCtrl::CTrackViewNodesCtrl(QWidget* hParentWnd, CTrackViewDialog*
, m_pTrackViewDialog(parent)
{
ui->setupUi(this);
- m_pDopeSheet = 0;
+ m_pDopeSheet = nullptr;
m_currentMatchIndex = 0;
m_matchCount = 0;
@@ -954,7 +954,7 @@ void CTrackViewNodesCtrl::OnSelectionChanged()
//////////////////////////////////////////////////////////////////////////
void CTrackViewNodesCtrl::OnNMRclick(QPoint point)
{
- CRecord* record = 0;
+ CRecord* record = nullptr;
bool isOnAzEntity = false;
CTrackViewSequence* sequence = GetIEditor()->GetAnimation()->GetSequence();
if (!sequence)
@@ -1605,7 +1605,7 @@ CTrackViewTrack* CTrackViewNodesCtrl::GetTrackViewTrack(const Export::EntityAnim
}
}
- return 0;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/TrackView/TrackViewSequenceManager.h b/Code/Editor/TrackView/TrackViewSequenceManager.h
index b181cf54b1..21c10f009a 100644
--- a/Code/Editor/TrackView/TrackViewSequenceManager.h
+++ b/Code/Editor/TrackView/TrackViewSequenceManager.h
@@ -29,7 +29,7 @@ public:
virtual void OnEditorNotifyEvent(EEditorNotifyEvent event);
- unsigned int GetCount() const { return m_sequences.size(); }
+ unsigned int GetCount() const { return static_cast(m_sequences.size()); }
void CreateSequence(QString name, SequenceType sequenceType);
void DeleteSequence(CTrackViewSequence* pSequence);
diff --git a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
index 19c8b2d4c2..c21403d1f5 100644
--- a/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
+++ b/Code/Editor/TrackView/TrackViewSplineCtrl.cpp
@@ -56,10 +56,10 @@ protected:
}
}
- virtual int GetSize() { return sizeof(*this); }
- virtual QString GetDescription() { return "UndoTrackViewSplineCtrl"; };
+ int GetSize() override { return sizeof(*this); }
+ QString GetDescription() override { return "UndoTrackViewSplineCtrl"; };
- virtual void Undo(bool bUndo)
+ void Undo(bool bUndo) override
{
CTrackViewSplineCtrl* pCtrl = FindControl(m_pCtrl);
if (pCtrl)
@@ -103,7 +103,7 @@ protected:
}
}
- virtual void Redo()
+ void Redo() override
{
const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
CTrackViewSequence* sequence = pSequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
@@ -136,7 +136,7 @@ protected:
sequence->OnKeySelectionChanged();
}
- virtual bool IsSelectionChanged() const
+ bool IsSelectionChanged() const override
{
const CTrackViewSequenceManager* sequenceManager = GetIEditor()->GetSequenceManager();
CTrackViewSequence* sequence = sequenceManager->GetSequenceByEntityId(m_sequenceEntityId);
@@ -151,19 +151,19 @@ protected:
}
public:
- typedef std::list CTrackViewSplineCtrls;
+ using CTrackViewSplineCtrls = std::list;
static CTrackViewSplineCtrl* FindControl(CTrackViewSplineCtrl* pCtrl)
{
if (!pCtrl)
{
- return 0;
+ return nullptr;
}
auto iter = std::find(s_activeCtrls.begin(), s_activeCtrls.end(), pCtrl);
if (iter == s_activeCtrls.end())
{
- return 0;
+ return nullptr;
}
return *iter;
@@ -449,7 +449,7 @@ void CTrackViewSplineCtrl::AddSpline(ISplineInterpolator* pSpline, CTrackViewTra
}
si.pSpline = pSpline;
- si.pDetailSpline = NULL;
+ si.pDetailSpline = nullptr;
m_splines.push_back(si);
m_tracks.push_back(pTrack);
m_bKeyTimesDirty = true;
@@ -896,7 +896,7 @@ bool CTrackViewSplineCtrl::IsUnifiedKeyCurrentlySelected() const
{
ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
- if (pSpline == NULL)
+ if (pSpline == nullptr)
{
continue;
}
@@ -960,7 +960,7 @@ void CTrackViewSplineCtrl::mouseReleaseEvent(QMouseEvent* event)
if (GetIEditor()->GetAnimation()->GetSequence())
{
bool restoreRecordModeToTrue = (m_editMode == TimeMarkerMode && m_stashedRecordModeWhenDraggingTime);
-
+
SplineWidget::mouseReleaseEvent(event);
if (restoreRecordModeToTrue)
diff --git a/Code/Editor/TrackView/TrackViewTrack.h b/Code/Editor/TrackView/TrackViewTrack.h
index 0c1f13274c..bbe81f6377 100644
--- a/Code/Editor/TrackView/TrackViewTrack.h
+++ b/Code/Editor/TrackView/TrackViewTrack.h
@@ -27,7 +27,7 @@ public:
: m_bAllOfSameType(true)
, m_bHasRotationTrack(false) {}
- unsigned int GetCount() const { return m_tracks.size(); }
+ unsigned int GetCount() const { return static_cast(m_tracks.size()); }
CTrackViewTrack* GetTrack(const unsigned int index) { return m_tracks[index]; }
const CTrackViewTrack* GetTrack(const unsigned int index) const { return m_tracks[index]; }
diff --git a/Code/Editor/UIEnumsDatabase.cpp b/Code/Editor/UIEnumsDatabase.cpp
index f0496f64e3..b859f54ffa 100644
--- a/Code/Editor/UIEnumsDatabase.cpp
+++ b/Code/Editor/UIEnumsDatabase.cpp
@@ -59,7 +59,7 @@ void CUIEnumsDatabase::SetEnumStrings(const QString& enumName, const QStringList
{
int nStringCount = sStringsArray.size();
- CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, 0);
+ CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, nullptr);
if (!pEnum)
{
pEnum = new CUIEnumsDatabase_SEnum;
@@ -86,6 +86,6 @@ void CUIEnumsDatabase::SetEnumStrings(const QString& enumName, const QStringList
//////////////////////////////////////////////////////////////////////////
CUIEnumsDatabase_SEnum* CUIEnumsDatabase::FindEnum(const QString& enumName) const
{
- CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, 0);
+ CUIEnumsDatabase_SEnum* pEnum = stl::find_in_map(m_enums, enumName, nullptr);
return pEnum;
}
diff --git a/Code/Editor/Undo/Undo.cpp b/Code/Editor/Undo/Undo.cpp
index 5b3d2cd73a..6af141b9e7 100644
--- a/Code/Editor/Undo/Undo.cpp
+++ b/Code/Editor/Undo/Undo.cpp
@@ -34,7 +34,7 @@ public:
{
m_undoSteps.push_back(step);
}
- virtual int GetSize() const
+ int GetSize() const override
{
int size = 0;
for (int i = 0; i < m_undoSteps.size(); i++)
@@ -43,18 +43,18 @@ public:
}
return size;
}
- virtual bool IsEmpty() const
+ bool IsEmpty() const override
{
return m_undoSteps.empty();
}
- virtual void Undo(bool bUndo)
+ void Undo(bool bUndo) override
{
for (int i = m_undoSteps.size() - 1; i >= 0; i--)
{
m_undoSteps[i]->Undo(bUndo);
}
}
- virtual void Redo()
+ void Redo() override
{
for (int i = 0; i < m_undoSteps.size(); i++)
{
@@ -113,8 +113,8 @@ CUndoManager::CUndoManager()
m_bRecording = false;
m_bSuperRecording = false;
- m_currentUndo = 0;
- m_superUndo = 0;
+ m_currentUndo = nullptr;
+ m_superUndo = nullptr;
m_assetManagerUndoInterruptor = new AssetManagerUndoInterruptor();
m_suspendCount = 0;
@@ -270,7 +270,7 @@ void CUndoManager::Accept(const QString& name)
}
m_bRecording = false;
- m_currentUndo = 0;
+ m_currentUndo = nullptr;
SignalNumUndoRedoToListeners();
@@ -303,7 +303,7 @@ void CUndoManager::Cancel()
}
delete m_currentUndo;
- m_currentUndo = 0;
+ m_currentUndo = nullptr;
//CLogFile::WriteLine( " Cancel OK" );
}
@@ -582,7 +582,7 @@ void CUndoManager::SuperAccept(const QString& name)
//CLogFile::FormatLine( "Undo Object Accepted (Undo:%d,Redo:%d)",m_undoStack.size(),m_redoStack.size() );
m_bSuperRecording = false;
- m_superUndo = 0;
+ m_superUndo = nullptr;
//CLogFile::WriteLine( " SupperAccept OK" );
SignalNumUndoRedoToListeners();
@@ -616,7 +616,7 @@ void CUndoManager::SuperCancel()
m_bSuperRecording = false;
delete m_superUndo;
- m_superUndo = 0;
+ m_superUndo = nullptr;
//CLogFile::WriteLine( " SuperCancel OK" );
}
@@ -708,8 +708,8 @@ void CUndoManager::Flush()
delete m_superUndo;
delete m_currentUndo;
- m_superUndo = 0;
- m_currentUndo = 0;
+ m_superUndo = nullptr;
+ m_currentUndo = nullptr;
SignalUndoFlushedToListeners();
}
diff --git a/Code/Editor/Undo/Undo.h b/Code/Editor/Undo/Undo.h
index 3f943f7a82..b9d8132a40 100644
--- a/Code/Editor/Undo/Undo.h
+++ b/Code/Editor/Undo/Undo.h
@@ -61,12 +61,12 @@ public:
// Confetti: Get the size of m_undoObjects
virtual int GetCount() const
{
- return m_undoObjects.size();
+ return static_cast(m_undoObjects.size());
}
virtual bool IsEmpty() const { return m_undoObjects.empty(); };
virtual void Undo(bool bUndo)
{
- for (int i = m_undoObjects.size() - 1; i >= 0; i--)
+ for (int i = static_cast(m_undoObjects.size() - 1); i >= 0; i--)
{
m_undoObjects[i]->Undo(bUndo);
}
@@ -116,7 +116,7 @@ public:
continue;
}
- if (m_undoObjects[i]->GetObjectName() == NULL)
+ if (m_undoObjects[i]->GetObjectName() == nullptr)
{
continue;
}
@@ -209,7 +209,7 @@ public:
bool IsHaveUndo() const;
bool IsHaveRedo() const;
-
+
void SetMaxUndoStep(int steps);
int GetMaxUndoStep() const;
diff --git a/Code/Editor/UndoDropDown.cpp b/Code/Editor/UndoDropDown.cpp
index 669c05ecaa..fbe18d5d52 100644
--- a/Code/Editor/UndoDropDown.cpp
+++ b/Code/Editor/UndoDropDown.cpp
@@ -56,7 +56,7 @@ public:
m_manager.AddListener(this);
}
- virtual ~UndoDropDownListModel()
+ ~UndoDropDownListModel() override
{
m_manager.RemoveListener(this);
}
@@ -81,7 +81,7 @@ public:
return m_stackNames[index.row()];
}
- void SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo)
+ void SignalNumUndoRedo(const unsigned int& numUndo, const unsigned int& numRedo) override
{
std::vector fresh;
if (UndoRedoDirection::Undo == m_direction && m_stackNames.size() != numUndo)
diff --git a/Code/Editor/Util/3DConnexionDriver.cpp b/Code/Editor/Util/3DConnexionDriver.cpp
index 26f45a4912..c1c3b47c4b 100644
--- a/Code/Editor/Util/3DConnexionDriver.cpp
+++ b/Code/Editor/Util/3DConnexionDriver.cpp
@@ -34,12 +34,12 @@ bool C3DConnexionDriver::InitDevice()
// Find the Raw Devices
UINT nDevices;
// Get Number of devices attached
- if (GetRawInputDeviceList(NULL, &nDevices, sizeof(RAWINPUTDEVICELIST)) != 0)
+ if (GetRawInputDeviceList(nullptr, &nDevices, sizeof(RAWINPUTDEVICELIST)) != 0)
{
return false;
}
// Create list large enough to hold all RAWINPUTDEVICE structs
- if ((m_pRawInputDeviceList = (PRAWINPUTDEVICELIST)malloc(sizeof(RAWINPUTDEVICELIST) * nDevices)) == NULL)
+ if ((m_pRawInputDeviceList = (PRAWINPUTDEVICELIST)malloc(sizeof(RAWINPUTDEVICELIST) * nDevices)) == nullptr)
{
return false;
}
@@ -85,7 +85,7 @@ bool C3DConnexionDriver::InitDevice()
m_pRawInputDevices[m_nUsagePage1Usage8Devices].usUsagePage = phidInfo->usUsagePage;
m_pRawInputDevices[m_nUsagePage1Usage8Devices].usUsage = phidInfo->usUsage;
m_pRawInputDevices[m_nUsagePage1Usage8Devices].dwFlags = 0;
- m_pRawInputDevices[m_nUsagePage1Usage8Devices].hwndTarget = NULL;
+ m_pRawInputDevices[m_nUsagePage1Usage8Devices].hwndTarget = nullptr;
m_nUsagePage1Usage8Devices++;
}
}
@@ -126,8 +126,8 @@ bool C3DConnexionDriver::GetInputMessageData(LPARAM lParam, S3DConnexionMessage&
{
if (event->header.dwType == RIM_TYPEHID)
{
- static BOOL bGotTranslation = FALSE,
- bGotRotation = FALSE;
+ static bool bGotTranslation = false,
+ bGotRotation = false;
static int all6DOFs[6] = {0};
LPRAWHID pRawHid = &event->data.hid;
diff --git a/Code/Editor/Util/DynamicArray2D.cpp b/Code/Editor/Util/DynamicArray2D.cpp
index 6d9b1683f2..6ac3edbb6b 100644
--- a/Code/Editor/Util/DynamicArray2D.cpp
+++ b/Code/Editor/Util/DynamicArray2D.cpp
@@ -58,7 +58,7 @@ CDynamicArray2D::~CDynamicArray2D()
}
delete [] m_Array;
- m_Array = 0;
+ m_Array = nullptr;
}
diff --git a/Code/Editor/Util/EditorUtils.cpp b/Code/Editor/Util/EditorUtils.cpp
index 8f56e4d956..33c311ed76 100644
--- a/Code/Editor/Util/EditorUtils.cpp
+++ b/Code/Editor/Util/EditorUtils.cpp
@@ -42,14 +42,14 @@ void HeapCheck::Check([[maybe_unused]] const char* file, [[maybe_unused]] int li
{
CString str;
str.Format( "Bad Start of Heap, at file %s line:%d",file,line );
- MessageBox( NULL,str,"Heap Check",MB_OK );
+ MessageBox( nullptr,str,"Heap Check",MB_OK );
}
break;
case _HEAPBADNODE:
{
CString str;
str.Format( "Bad Node in Heap, at file %s line:%d",file,line );
- MessageBox( NULL,str,"Heap Check",MB_OK );
+ MessageBox( nullptr,str,"Heap Check",MB_OK );
}
break;
}
@@ -258,7 +258,7 @@ namespace EditorUtils
AzWarningAbsorber::AzWarningAbsorber(const char* window)
: m_window(window)
AZ_POP_DISABLE_WARNING
- {
+ {
BusConnect();
}
diff --git a/Code/Editor/Util/EditorUtils.h b/Code/Editor/Util/EditorUtils.h
index fb767c98b3..355a1939c2 100644
--- a/Code/Editor/Util/EditorUtils.h
+++ b/Code/Editor/Util/EditorUtils.h
@@ -359,7 +359,7 @@ inline QString TokenizeString(const QString& s, LPCSTR pszTokens, int& iStart)
QByteArray str = s.toUtf8();
- if (pszTokens == NULL)
+ if (pszTokens == nullptr)
{
return str;
}
@@ -472,7 +472,7 @@ inline const char* strstri(const char* pString, const char* pSubstring)
}
}
- return NULL;
+ return nullptr;
}
@@ -542,7 +542,7 @@ public:
// There is a bug in QT with writing files larger than 32MB. It separates
// the write into 32MB blocks, but doesn't write the last block correctly.
// To deal with this, we'll separate into blocks here so QT doesn't have to.
-
+
// QT bug in qfileengine_win.cpp line 434. Block size is calculated once and always
// used as the amount of data to write, but for the last block, unless there is exactly
// block size left to write, the actual remaining amount needs to be written, not the
@@ -658,14 +658,14 @@ inline CArchive& operator>>(CArchive& ar, QString& str)
str = QString::fromUtf16(reinterpret_cast(raw), aznumeric_cast(length));
}
}
-
+
return ar;
}
inline CArchive& operator<<(CArchive& ar, const QString& str)
{
// This is written to mimic how MFC archiving worked, which was to
- // write markers to indicate the size of the length -
+ // write markers to indicate the size of the length -
// so a length that will fit into 8 bits takes 8 bits.
// A length that requires more than 8 bits, puts an 8 bit marker (0xff)
// to indicate that the length is greater, then 16 bits for the length.
@@ -693,7 +693,7 @@ inline CArchive& operator<<(CArchive& ar, const QString& str)
ar << static_cast(0xffff);
ar << static_cast(length);
}
-
+
ar.device()->write(data);
return ar;
diff --git a/Code/Editor/Util/FileChangeMonitor.cpp b/Code/Editor/Util/FileChangeMonitor.cpp
index c2448e5dac..8a1f961bb0 100644
--- a/Code/Editor/Util/FileChangeMonitor.cpp
+++ b/Code/Editor/Util/FileChangeMonitor.cpp
@@ -16,7 +16,7 @@
#include
-CFileChangeMonitor* CFileChangeMonitor::s_pFileMonitorInstance = NULL;
+CFileChangeMonitor* CFileChangeMonitor::s_pFileMonitorInstance = nullptr;
//////////////////////////////////////////////////////////////////////////
CFileChangeMonitor::CFileChangeMonitor(QObject* parent)
@@ -34,7 +34,7 @@ CFileChangeMonitor::~CFileChangeMonitor()
if (pListener)
{
- pListener->SetMonitor(NULL);
+ pListener->SetMonitor(nullptr);
}
}
@@ -143,7 +143,7 @@ void CFileChangeMonitor::Unsubscribe(CFileChangeMonitorListener* pListener)
{
assert(pListener);
m_listeners.erase(pListener);
- pListener->SetMonitor(NULL);
+ pListener->SetMonitor(nullptr);
}
void CFileChangeMonitor::OnDirectoryChange(const QString &path)
diff --git a/Code/Editor/Util/FileChangeMonitor.h b/Code/Editor/Util/FileChangeMonitor.h
index c2746dc30a..b32686bec4 100644
--- a/Code/Editor/Util/FileChangeMonitor.h
+++ b/Code/Editor/Util/FileChangeMonitor.h
@@ -111,7 +111,7 @@ class CFileChangeMonitorListener
{
public:
CFileChangeMonitorListener()
- : m_pMonitor(NULL)
+ : m_pMonitor(nullptr)
{
}
diff --git a/Code/Editor/Util/FileEnum.cpp b/Code/Editor/Util/FileEnum.cpp
index 1d13929889..98ff0f7f4e 100644
--- a/Code/Editor/Util/FileEnum.cpp
+++ b/Code/Editor/Util/FileEnum.cpp
@@ -12,7 +12,7 @@
#include "FileEnum.h"
CFileEnum::CFileEnum()
- : m_hEnumFile(0)
+ : m_hEnumFile(nullptr)
{
}
@@ -21,7 +21,7 @@ CFileEnum::~CFileEnum()
if (m_hEnumFile)
{
delete m_hEnumFile;
- m_hEnumFile = 0;
+ m_hEnumFile = nullptr;
}
}
@@ -53,7 +53,7 @@ bool CFileEnum::StartEnumeration(const QString& szEnumPathAndPattern, QFileInfo*
if (m_hEnumFile)
{
delete m_hEnumFile;
- m_hEnumFile = 0;
+ m_hEnumFile = nullptr;
}
QStringList parts = szEnumPathAndPattern.split(QRegularExpression(R"([\\/])"));
@@ -66,7 +66,7 @@ bool CFileEnum::StartEnumeration(const QString& szEnumPathAndPattern, QFileInfo*
{
// No files found
delete m_hEnumFile;
- m_hEnumFile = 0;
+ m_hEnumFile = nullptr;
return false;
}
@@ -84,7 +84,7 @@ bool CFileEnum::GetNextFile(QFileInfo* pFile)
{
// No more files left
delete m_hEnumFile;
- m_hEnumFile = 0;
+ m_hEnumFile = nullptr;
return false;
}
diff --git a/Code/Editor/Util/FileUtil.cpp b/Code/Editor/Util/FileUtil.cpp
index 9e4f688f69..32154ec66d 100644
--- a/Code/Editor/Util/FileUtil.cpp
+++ b/Code/Editor/Util/FileUtil.cpp
@@ -279,7 +279,7 @@ void CFileUtil::EditTextureFile(const char* textureFile, [[maybe_unused]] bool b
// Qt does.
QString fullTexturePathFixedForWindows = QString(fullTexturePath.data()).replace('/', '\\');
QByteArray fullTexturePathFixedForWindowsUtf8 = fullTexturePathFixedForWindows.toUtf8();
- HINSTANCE hInst = ShellExecute(NULL, "open", textureEditorPath.data(), fullTexturePathFixedForWindowsUtf8.data(), NULL, SW_SHOWNORMAL);
+ HINSTANCE hInst = ShellExecute(nullptr, "open", textureEditorPath.data(), fullTexturePathFixedForWindowsUtf8.data(), nullptr, SW_SHOWNORMAL);
failedToLaunch = ((DWORD_PTR)hInst <= 32);
#elif defined(AZ_PLATFORM_MAC)
failedToLaunch = QProcess::execute(QString("/usr/bin/open"), {"-a", gSettings.textureEditor, QString(fullTexturePath.data()) }) != 0;
@@ -332,7 +332,7 @@ bool CFileUtil::EditMayaFile(const char* filepath, const bool bExtractFromPak, c
CryMessageBox("Can't open the file. You can specify a source editor in Sandbox Preferences or create an association in Windows.", "Cannot open file!", MB_OK | MB_ICONERROR);
}
}
- return TRUE;
+ return true;
}
//////////////////////////////////////////////////////////////////////////
@@ -348,10 +348,10 @@ bool CFileUtil::EditFile(const char* filePath, const bool bExtrackFromPak, const
else if ((extension.compare(".bspace") == 0) || (extension.compare(".comb") == 0))
{
EditTextFile(filePath, 0, IFileUtil::FILE_TYPE_BSPACE);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
//////////////////////////////////////////////////////////////////////////
@@ -374,7 +374,7 @@ bool CFileUtil::CalculateDccFilename(const QString& assetFilename, QString& dccF
//////////////////////////////////////////////////////////////////////////
bool CFileUtil::ExtractDccFilenameFromAssetDatabase(const QString& assetFilename, QString& dccFilename)
{
- IAssetItemDatabase* pCurrentDatabaseInterface = NULL;
+ IAssetItemDatabase* pCurrentDatabaseInterface = nullptr;
std::vector assetDatabasePlugins;
IEditorClassFactory* pClassFactory = GetIEditor()->GetClassFactory();
pClassFactory->GetClassesByCategory("Asset Item DB", assetDatabasePlugins);
@@ -592,7 +592,7 @@ inline bool ScanDirectoryFiles(const QString& root, const QString& path, const Q
/*
CFileFind finder;
- BOOL bWorking = finder.FindFile( Path::Make(dir,fileSpec) );
+ bool bWorking = finder.FindFile( Path::Make(dir,fileSpec) );
while (bWorking)
{
bWorking = finder.FindNextFile();
@@ -663,7 +663,7 @@ inline int ScanDirectoryRecursive(const QString& root, const QString& path, cons
{
/*
CFileFind finder;
- BOOL bWorking = finder.FindFile( Path::Make(dir,"*.*") );
+ bool bWorking = finder.FindFile( Path::Make(dir,"*.*") );
while (bWorking)
{
bWorking = finder.FindNextFile();
@@ -847,12 +847,12 @@ void BlockAndWait(const bool& opComplete, QWidget* parent, const char* message)
{
// note that 16ms below is not the amount of time to wait, its the maximum time that
// processEvents is allowed to keep processing them if they just keep being emitted.
- // adding a maximum time here means that we get an opportunity to pump the TickBus
+ // adding a maximum time here means that we get an opportunity to pump the TickBus
// periodically even during a flood of events.
QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 16);
AZ::TickBus::ExecuteQueuedEvents();
}
-
+
// if we are not the main thread then the above will be done by the main thread, and we can just wait for it to happen.
// its fairly important we don't sleep for really long because this legacy code is often invoked in a blocking loop
// for many items, and in the worst case, any time we spend sleeping here will be added to each item.
@@ -1206,10 +1206,10 @@ bool CFileUtil::CreatePath(const QString& strPath)
QString strFilename;
QString strExtension;
QString strCurrentDirectoryPath;
- QStringList cstrDirectoryQueue;
+ QStringList cstrDirectoryQueue;
size_t nCurrentPathQueue(0);
size_t nTotalPathQueueElements(0);
- BOOL bnLastDirectoryWasCreated(FALSE);
+ bool bnLastDirectoryWasCreated(false);
if (PathExists(strPath))
{
@@ -1361,7 +1361,7 @@ IFileUtil::ECopyTreeResult CFileUtil::CopyTree(const QString& strSourceDirectory
nTotal = cFiles.size();
for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
{
- BOOL bnLastFileWasCopied(FALSE);
+ bool bnLastFileWasCopied(false);
if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
@@ -1447,7 +1447,7 @@ IFileUtil::ECopyTreeResult CFileUtil::CopyTree(const QString& strSourceDirectory
return eCopyResult;
}
- BOOL bnLastDirectoryWasCreated(FALSE);
+ bool bnLastDirectoryWasCreated(false);
QString sourceName = sourceDir.absoluteFilePath(cDirectories[nCurrent]);
QString targetName = targetDir.absoluteFilePath(cDirectories[nCurrent]);
@@ -1529,7 +1529,7 @@ IFileUtil::ECopyTreeResult CFileUtil::CopyFile(const QString& strSourceFile, c
CUserOptions oFileOptions;
IFileUtil::ECopyTreeResult eCopyResult(IFileUtil::ETREECOPYOK);
- BOOL bnLastFileWasCopied(FALSE);
+ bool bnLastFileWasCopied(false);
QString name(strSourceFile);
QString strQueryFilename;
QString strFullStargetName;
@@ -1658,7 +1658,7 @@ IFileUtil::ECopyTreeResult CFileUtil::CopyFile(const QString& strSourceFile, c
}
if (pfnProgress)
{
- pfnProgress(source.size(), totalRead, 0, 0, 0, 0, 0, 0, 0);
+ pfnProgress(source.size(), totalRead, 0, 0, 0, 0, nullptr, nullptr, nullptr);
}
}
if (totalRead != source.size())
@@ -1742,7 +1742,7 @@ IFileUtil::ECopyTreeResult CFileUtil::MoveTree(const QString& strSourceDirecto
return eCopyResult;
}
- BOOL bnLastFileWasCopied(FALSE);
+ bool bnLastFileWasCopied(false);
QString sourceName(sourceDir.absoluteFilePath(cFiles[nCurrent]));
QString targetName(targetDir.absoluteFilePath(cFiles[nCurrent]));
@@ -1816,7 +1816,7 @@ IFileUtil::ECopyTreeResult CFileUtil::MoveTree(const QString& strSourceDirecto
nTotal = cDirectories.size();
for (nCurrent = 0; nCurrent < nTotal; ++nCurrent)
{
- BOOL bnLastDirectoryWasCreated(FALSE);
+ bool bnLastDirectoryWasCreated(false);
if (eCopyResult == IFileUtil::ETREECOPYUSERCANCELED)
{
diff --git a/Code/Editor/Util/FileUtil.h b/Code/Editor/Util/FileUtil.h
index 000215e98d..210d702f71 100644
--- a/Code/Editor/Util/FileUtil.h
+++ b/Code/Editor/Util/FileUtil.h
@@ -123,7 +123,7 @@ public:
//////////////////////////////////////////////////////////////////////////
// @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
- // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
+ // @param LPBOOL pbCancel - when the contents of this BOOL are set to true, the system cancels the copy operation
static IFileUtil::ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = nullptr, bool* pbCancel = nullptr);
diff --git a/Code/Editor/Util/FileUtil_impl.h b/Code/Editor/Util/FileUtil_impl.h
index 2f2872ff6f..04d9e829b9 100644
--- a/Code/Editor/Util/FileUtil_impl.h
+++ b/Code/Editor/Util/FileUtil_impl.h
@@ -110,8 +110,8 @@ public:
//////////////////////////////////////////////////////////////////////////
// @param LPPROGRESS_ROUTINE pfnProgress - called by the system to notify of file copy progress
- // @param LPBOOL pbCancel - when the contents of this BOOL are set to TRUE, the system cancels the copy operation
- ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = NULL, bool* pbCancel = NULL) override;
+ // @param LPBOOL pbCancel - when the contents of this BOOL are set to true, the system cancels the copy operation
+ ECopyTreeResult CopyFile(const QString& strSourceFile, const QString& strTargetFile, bool boConfirmOverwrite = false, ProgressRoutine pfnProgress = nullptr, bool* pbCancel = nullptr) override;
// As we don't have a FileUtil interface here, we have to duplicate some code :-( in order to keep
// function calls clean.
diff --git a/Code/Editor/Util/GdiUtil.h b/Code/Editor/Util/GdiUtil.h
index f61781f7d4..55165b5799 100644
--- a/Code/Editor/Util/GdiUtil.h
+++ b/Code/Editor/Util/GdiUtil.h
@@ -35,7 +35,7 @@ public:
~CAlphaBitmap();
//! creates the bitmap from raw 32bpp data
- //! \param pData the 32bpp raw image data, RGBA, can be NULL and it would create just an empty bitmap
+ //! \param pData the 32bpp raw image data, RGBA, can be nullptr and it would create just an empty bitmap
//! \param aWidth the bitmap width
//! \param aHeight the bitmap height
bool Create(void* pData, UINT aWidth, UINT aHeight, bool bVerticalFlip = false, bool bPremultiplyAlpha = false);
diff --git a/Code/Editor/Util/IXmlHistoryManager.h b/Code/Editor/Util/IXmlHistoryManager.h
index 78d849df7d..20f9dd4573 100644
--- a/Code/Editor/Util/IXmlHistoryManager.h
+++ b/Code/Editor/Util/IXmlHistoryManager.h
@@ -37,7 +37,7 @@ struct IXmlHistoryEventListener
eHET_HistoryGroupAdded,
eHET_HistoryGroupRemoved,
};
- virtual void OnEvent(EHistoryEventType event, void* pData = NULL) = 0;
+ virtual void OnEvent(EHistoryEventType event, void* pData = nullptr) = 0;
};
struct IXmlHistoryView
diff --git a/Code/Editor/Util/ImageASC.cpp b/Code/Editor/Util/ImageASC.cpp
index 69a6892c65..c018018196 100644
--- a/Code/Editor/Util/ImageASC.cpp
+++ b/Code/Editor/Util/ImageASC.cpp
@@ -105,34 +105,34 @@ bool CImageASC::Load(const QString& fileName, CFloatImage& image)
// ncols = grid width
validData = validData && (azstricmp(token, "ncols") == 0);
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
width = atoi(token);
// nrows = grid height
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
validData = validData && (azstricmp(token, "nrows") == 0);
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
height = atoi(token);
// xllcorner = leftmost coordinate. (Skip, we don't care about it)
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
validData = validData && (azstricmp(token, "xllcorner") == 0);
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
// yllcorner = bottommost coordinate. (Skip, we don't care about it)
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
validData = validData && (azstricmp(token, "yllcorner") == 0);
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
// cellsize = size of each grid cell. (Skip, we don't care about it)
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
validData = validData && (azstricmp(token, "cellsize") == 0);
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
// nodata_value = the value used for missing data. We'll replace these with 0 height.
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
validData = validData && (azstricmp(token, "nodata_value") == 0);
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
nodataValue = atof(token);
if (!validData)
@@ -152,10 +152,10 @@ bool CImageASC::Load(const QString& fileName, CFloatImage& image)
int i = 0;
float pixelValue;
float maxPixel = 0.0f;
- while (token != NULL && i < size)
+ while (token != nullptr && i < size)
{
- token = azstrtok(NULL, 0, seps, &nextToken);
- if (token != NULL)
+ token = azstrtok(nullptr, 0, seps, &nextToken);
+ if (token != nullptr)
{
// Negative heights aren't supported, clamp to 0.
pixelValue = max(0.0, atof(token));
diff --git a/Code/Editor/Util/ImageGif.cpp b/Code/Editor/Util/ImageGif.cpp
index a0cd6c5650..2c07fc9acb 100644
--- a/Code/Editor/Util/ImageGif.cpp
+++ b/Code/Editor/Util/ImageGif.cpp
@@ -223,7 +223,7 @@ bool CImageGif::Load(const QString& fileName, CImageEx& outImage)
Pass = 0;
OutCount = 0;
- Palette = NULL;
+ Palette = nullptr;
CHK (Raster = new uint8 [filesize]);
if (strncmp((char*) ptr, id87, 6))
diff --git a/Code/Editor/Util/ImageTIF.cpp b/Code/Editor/Util/ImageTIF.cpp
index 9040306a44..c4f21855a4 100644
--- a/Code/Editor/Util/ImageTIF.cpp
+++ b/Code/Editor/Util/ImageTIF.cpp
@@ -142,7 +142,7 @@ bool CImageTIF::Load(const QString& fileName, CImageEx& outImage)
uint32 dwWidth, dwHeight;
size_t npixels;
uint32* raster;
- char* dccfilename = NULL;
+ char* dccfilename = nullptr;
TIFFGetField(tif, TIFFTAG_IMAGEWIDTH, &dwWidth);
TIFFGetField(tif, TIFFTAG_IMAGELENGTH, &dwHeight);
@@ -232,7 +232,7 @@ bool CImageTIF::Load(const QString& fileName, CFloatImage& outImage)
{
uint32 width = 0, height = 0;
uint16 spp = 0, bpp = 0, format = 0;
- char* dccfilename = NULL;
+ char* dccfilename = nullptr;
TIFFGetField(tif, TIFFTAG_IMAGEDESCRIPTION, &dccfilename);
@@ -252,11 +252,11 @@ bool CImageTIF::Load(const QString& fileName, CFloatImage& outImage)
// Check to see if it's a GeoTIFF, and if so, whether or not it has the ZScale parameter.
uint32 tagCount = 0;
- double *pixelScales = NULL;
+ double *pixelScales = nullptr;
if (TIFFGetField(tif, GEOTIFF_MODELPIXELSCALE_TAG, &tagCount, &pixelScales) == 1)
{
// if there's an xyz scale, and the Z scale isn't 0, let's use it.
- if ((tagCount == 3) && (pixelScales != NULL) && (pixelScales[2] != 0.0f))
+ if ((tagCount == 3) && (pixelScales != nullptr) && (pixelScales[2] != 0.0f))
{
pixelValueScale = static_cast(pixelScales[2]);
}
@@ -455,7 +455,7 @@ const char* CImageTIF::GetPreset(const QString& fileName)
if (!file.Open(fileName.toUtf8().data(), "rb"))
{
CLogFile::FormatLine("File not found %s", fileName.toUtf8().data());
- return NULL;
+ return nullptr;
}
MemImage memImage;
@@ -473,7 +473,7 @@ const char* CImageTIF::GetPreset(const QString& fileName)
libtiffDummyCloseProc, libtiffDummySizeProc, libtiffDummyMapFileProc, libtiffDummyUnmapFileProc);
string strReturn;
- char* preset = NULL;
+ char* preset = nullptr;
int size;
if (tif)
{
diff --git a/Code/Editor/Util/ImageUtil.cpp b/Code/Editor/Util/ImageUtil.cpp
index 1b985c82f9..3d121a1d47 100644
--- a/Code/Editor/Util/ImageUtil.cpp
+++ b/Code/Editor/Util/ImageUtil.cpp
@@ -149,13 +149,13 @@ bool CImageUtil::LoadPGM(const QString& fileName, CImageEx& image)
char* nextToken = nullptr;
token = azstrtok(str, 0, seps, &nextToken);
- while (token != NULL && token[0] == '#')
+ while (token != nullptr && token[0] == '#')
{
- if (token != NULL && token[0] == '#')
+ if (token != nullptr && token[0] == '#')
{
- azstrtok(NULL, 0, "\n", &nextToken);
+ azstrtok(nullptr, 0, "\n", &nextToken);
}
- token = azstrtok(NULL, 0, seps, &nextToken);
+ token = azstrtok(nullptr, 0, seps, &nextToken);
}
if (azstricmp(token, "P2") != 0)
{
@@ -167,32 +167,32 @@ bool CImageUtil::LoadPGM(const QString& fileName, CImageEx& image)
do
{
- token = azstrtok(NULL, 0, seps, &nextToken);
- if (token != NULL && token[0] == '#')
+ token = azstrtok(nullptr, 0, seps, &nextToken);
+ if (token != nullptr && token[0] == '#')
{
- azstrtok(NULL, 0, "\n", &nextToken);
+ azstrtok(nullptr, 0, "\n", &nextToken);
}
- } while (token != NULL && token[0] == '#');
+ } while (token != nullptr && token[0] == '#');
width = atoi(token);
do
{
- token = azstrtok(NULL, 0, seps, &nextToken);
- if (token != NULL && token[0] == '#')
+ token = azstrtok(nullptr, 0, seps, &nextToken);
+ if (token != nullptr && token[0] == '#')
{
- azstrtok(NULL, 0, "\n", &nextToken);
+ azstrtok(nullptr, 0, "\n", &nextToken);
}
- } while (token != NULL && token[0] == '#');
+ } while (token != nullptr && token[0] == '#');
height = atoi(token);
do
{
- token = azstrtok(NULL, 0, seps, &nextToken);
- if (token != NULL && token[0] == '#')
+ token = azstrtok(nullptr, 0, seps, &nextToken);
+ if (token != nullptr && token[0] == '#')
{
- azstrtok(NULL, 0, "\n", &nextToken);
+ azstrtok(nullptr, 0, "\n", &nextToken);
}
- } while (token != NULL && token[0] == '#');
+ } while (token != nullptr && token[0] == '#');
numColors = atoi(token);
image.Allocate(width, height);
@@ -200,12 +200,12 @@ bool CImageUtil::LoadPGM(const QString& fileName, CImageEx& image)
uint32* p = image.GetData();
int size = width * height;
int i = 0;
- while (token != NULL && i < size)
+ while (token != nullptr && i < size)
{
do
{
- token = azstrtok(NULL, 0, seps, &nextToken);
- } while (token != NULL && token[0] == '#');
+ token = azstrtok(nullptr, 0, seps, &nextToken);
+ } while (token != nullptr && token[0] == '#');
*p++ = atoi(token);
i++;
}
diff --git a/Code/Editor/Util/IndexedFiles.cpp b/Code/Editor/Util/IndexedFiles.cpp
index c90b3c5f20..ae777abb49 100644
--- a/Code/Editor/Util/IndexedFiles.cpp
+++ b/Code/Editor/Util/IndexedFiles.cpp
@@ -14,7 +14,7 @@
#include "IndexedFiles.h"
volatile TIntAtomic CIndexedFiles::s_bIndexingDone;
-CIndexedFiles* CIndexedFiles::s_pIndexedFiles = NULL;
+CIndexedFiles* CIndexedFiles::s_pIndexedFiles = nullptr;
bool CIndexedFiles::m_startedFileIndexing = false;
diff --git a/Code/Editor/Util/IndexedFiles.h b/Code/Editor/Util/IndexedFiles.h
index 34554dbe37..e23c0ea827 100644
--- a/Code/Editor/Util/IndexedFiles.h
+++ b/Code/Editor/Util/IndexedFiles.h
@@ -88,7 +88,7 @@ public:
}
public:
- void Initialize(const QString& path, IFileUtil::ScanDirectoryUpdateCallBack updateCB = NULL);
+ void Initialize(const QString& path, IFileUtil::ScanDirectoryUpdateCallBack updateCB = nullptr);
// Adds a new file to the database.
void AddFile(const IFileUtil::FileDesc& path);
diff --git a/Code/Editor/Util/KDTree.cpp b/Code/Editor/Util/KDTree.cpp
index c8fe742370..4547149e9b 100644
--- a/Code/Editor/Util/KDTree.cpp
+++ b/Code/Editor/Util/KDTree.cpp
@@ -17,9 +17,9 @@ class KDTreeNode
public:
KDTreeNode()
{
- pChildren[0] = NULL;
- pChildren[1] = NULL;
- pVertexIndices = NULL;
+ pChildren[0] = nullptr;
+ pChildren[1] = nullptr;
+ pVertexIndices = nullptr;
}
~KDTreeNode()
{
@@ -76,13 +76,13 @@ public:
}
bool IsLeaf() const
{
- return pChildren[0] == NULL && pChildren[1] == NULL;
+ return pChildren[0] == nullptr && pChildren[1] == nullptr;
}
KDTreeNode* GetChild(uint32 nIndex) const
{
if (nIndex > 1)
{
- return NULL;
+ return nullptr;
}
return pChildren[nIndex];
}
@@ -200,7 +200,7 @@ bool SearchForBestSplitPos(CKDTree::ESplitAxis axis, const std::vectorpStatObj->GetIndexedMesh();
- if (pMesh == NULL)
+ if (pMesh == nullptr)
{
continue;
}
@@ -256,7 +256,7 @@ bool SplitNode(const std::vector& statObjList, const AABB& bo
const CKDTree::SStatObj* pObj = &statObjList[nObjIndex];
const IIndexedMesh* pMesh = pObj->pStatObj->GetIndexedMesh();
- if (pMesh == NULL)
+ if (pMesh == nullptr)
{
return false;
}
@@ -295,7 +295,7 @@ bool SplitNode(const std::vector& statObjList, const AABB& bo
CKDTree::CKDTree()
{
- m_pRootNode = NULL;
+ m_pRootNode = nullptr;
}
CKDTree::~CKDTree()
@@ -308,7 +308,7 @@ CKDTree::~CKDTree()
bool CKDTree::Build(IStatObj* pStatObj)
{
- if (pStatObj == NULL)
+ if (pStatObj == nullptr)
{
return false;
}
@@ -332,7 +332,7 @@ bool CKDTree::Build(IStatObj* pStatObj)
for (int i = 0, iStatObjSize(m_StatObjectList.size()); i < iStatObjSize; ++i)
{
IIndexedMesh* pMesh = m_StatObjectList[i].pStatObj->GetIndexedMesh(true);
- if (pMesh == NULL)
+ if (pMesh == nullptr)
{
continue;
}
@@ -398,7 +398,7 @@ void CKDTree::BuildRecursively(KDTreeNode* pNode, const AABB& boundbox, std::vec
void CKDTree::ConstructStatObjList(IStatObj* pStatObj, const Matrix34& matParent)
{
- if (pStatObj == NULL)
+ if (pStatObj == nullptr)
{
return;
}
@@ -472,7 +472,7 @@ bool CKDTree::FindNearestVertexRecursively(KDTreeNode* pNode, const Vec3& raySrc
const SStatObj* pStatObjInfo = &(m_StatObjectList[nObjIndex]);
IIndexedMesh* pMesh = m_StatObjectList[nObjIndex].pStatObj->GetIndexedMesh();
- if (pMesh == NULL)
+ if (pMesh == nullptr)
{
continue;
}
diff --git a/Code/Editor/Util/Math.h b/Code/Editor/Util/Math.h
index 66bbf883e8..34fb77e434 100644
--- a/Code/Editor/Util/Math.h
+++ b/Code/Editor/Util/Math.h
@@ -128,7 +128,7 @@ inline float PointToLineDistance(const Vec3& p1, const Vec3& p2, const Vec3& p3,
@param p2 Target point of first line.
@param p3 Source point of second line.
@param p4 Target point of second line.
- @return FALSE if no solution exists.
+ @return false if no solution exists.
*/
inline bool LineLineIntersect(const Vec3& p1, const Vec3& p2, const Vec3& p3, const Vec3& p4,
Vec3& pa, Vec3& pb, float& mua, float& mub)
diff --git a/Code/Editor/Util/MemoryBlock.cpp b/Code/Editor/Util/MemoryBlock.cpp
index 1368553511..03d432762d 100644
--- a/Code/Editor/Util/MemoryBlock.cpp
+++ b/Code/Editor/Util/MemoryBlock.cpp
@@ -18,7 +18,7 @@
//////////////////////////////////////////////////////////////////////////
CMemoryBlock::CMemoryBlock()
- : m_buffer(0)
+ : m_buffer(nullptr)
, m_size(0)
, m_uncompressedSize(0)
, m_owns(false)
@@ -54,7 +54,7 @@ CMemoryBlock& CMemoryBlock::operator=(const CMemoryBlock& mem)
}
else
{
- m_buffer = 0;
+ m_buffer = nullptr;
m_size = 0;
m_owns = false;
}
@@ -104,7 +104,7 @@ bool CMemoryBlock::Allocate(int size, int uncompressedSize)
m_size = size;
m_uncompressedSize = uncompressedSize;
// Check if allocation failed.
- if (m_buffer == 0)
+ if (m_buffer == nullptr)
{
return false;
}
@@ -118,7 +118,7 @@ void CMemoryBlock::Free()
{
free(m_buffer);
}
- m_buffer = 0;
+ m_buffer = nullptr;
m_owns = false;
m_size = 0;
m_uncompressedSize = 0;
diff --git a/Code/Editor/Util/NamedData.cpp b/Code/Editor/Util/NamedData.cpp
index 1f0d6c5a50..240d71f58d 100644
--- a/Code/Editor/Util/NamedData.cpp
+++ b/Code/Editor/Util/NamedData.cpp
@@ -36,7 +36,7 @@ void CNamedData::AddDataBlock(const QString& blockName, void* pData, int nSize
assert(pData);
assert(nSize > 0);
- DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
+ DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)nullptr);
if (pBlock)
{
delete pBlock;
@@ -66,7 +66,7 @@ void CNamedData::AddDataBlock(const QString& blockName, void* pData, int nSize
void CNamedData::AddDataBlock(const QString& blockName, CMemoryBlock& mem)
{
- DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
+ DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)nullptr);
if (pBlock)
{
delete pBlock;
@@ -102,7 +102,7 @@ void CNamedData::Clear()
//////////////////////////////////////////////////////////////////////////
bool CNamedData::GetDataBlock(const QString& blockName, void*& pData, int& nSize)
{
- pData = 0;
+ pData = nullptr;
nSize = 0;
bool bUncompressed = false;
@@ -119,10 +119,10 @@ bool CNamedData::GetDataBlock(const QString& blockName, void*& pData, int& nSize
//////////////////////////////////////////////////////////////////////////
CMemoryBlock* CNamedData::GetDataBlock(const QString& blockName, bool& bCompressed)
{
- DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)0);
+ DataBlock* pBlock = stl::find_in_map(m_blocks, blockName, (DataBlock*)nullptr);
if (!pBlock)
{
- return 0;
+ return nullptr;
}
if (bCompressed)
@@ -150,7 +150,7 @@ CMemoryBlock* CNamedData::GetDataBlock(const QString& blockName, bool& bCompress
}
}
}
- return 0;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Editor/Util/PakFile.cpp b/Code/Editor/Util/PakFile.cpp
index 5c26b9a7a2..88d5598495 100644
--- a/Code/Editor/Util/PakFile.cpp
+++ b/Code/Editor/Util/PakFile.cpp
@@ -21,14 +21,14 @@
//////////////////////////////////////////////////////////////////////////
CPakFile::CPakFile()
- : m_pArchive(NULL)
- , m_pCryPak(NULL)
+ : m_pArchive(nullptr)
+ , m_pCryPak(nullptr)
{
}
//////////////////////////////////////////////////////////////////////////
CPakFile::CPakFile(AZ::IO::IArchive* pCryPak)
- : m_pArchive(NULL)
+ : m_pArchive(nullptr)
, m_pCryPak(pCryPak)
{
}
@@ -42,14 +42,14 @@ CPakFile::~CPakFile()
//////////////////////////////////////////////////////////////////////////
CPakFile::CPakFile(const char* filename)
{
- m_pArchive = NULL;
+ m_pArchive = nullptr;
Open(filename);
}
//////////////////////////////////////////////////////////////////////////
void CPakFile::Close()
{
- m_pArchive = NULL;
+ m_pArchive = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -61,7 +61,7 @@ bool CPakFile::Open(const char* filename, bool bAbsolutePath)
}
auto pCryPak = m_pCryPak ? m_pCryPak : GetIEditor()->GetSystem()->GetIPak();
- if (pCryPak == NULL)
+ if (pCryPak == nullptr)
{
return false;
}
@@ -89,7 +89,7 @@ bool CPakFile::OpenForRead(const char* filename)
Close();
}
auto pCryPak = m_pCryPak ? m_pCryPak : GetIEditor()->GetSystem()->GetIPak();
- if (pCryPak == NULL)
+ if (pCryPak == nullptr)
{
return false;
}
diff --git a/Code/Editor/Util/PathUtil.cpp b/Code/Editor/Util/PathUtil.cpp
index 4bb5c20ece..2be09da06f 100644
--- a/Code/Editor/Util/PathUtil.cpp
+++ b/Code/Editor/Util/PathUtil.cpp
@@ -42,7 +42,7 @@ namespace Path
// Directory named filenames containing ":" are invalid, so we can assume if there is a :
// it will be the drive name.
pchCurrentPosition = strchr(pchLastPosition, ':');
- if (pchCurrentPosition == NULL)
+ if (pchCurrentPosition == nullptr)
{
rstrDriveLetter = "";
}
@@ -54,7 +54,7 @@ namespace Path
pchCurrentPosition = strrchr(pchLastPosition, '\\');
pchAuxPosition = strrchr(pchLastPosition, '/');
- if ((pchCurrentPosition == NULL) && (pchAuxPosition == NULL))
+ if ((pchCurrentPosition == nullptr) && (pchAuxPosition == nullptr))
{
rstrDirectory = "";
}
@@ -70,7 +70,7 @@ namespace Path
}
pchCurrentPosition = strrchr(pchLastPosition, '.');
- if (pchCurrentPosition == NULL)
+ if (pchCurrentPosition == nullptr)
{
rstrExtension = "";
strFilename.assign(pchLastPosition);
@@ -114,7 +114,7 @@ namespace Path
do
{
pchCurrentPosition = strpbrk(pchLastPosition, "\\/");
- if (pchCurrentPosition == NULL)
+ if (pchCurrentPosition == nullptr)
{
break;
}
diff --git a/Code/Editor/Util/PathUtil.h b/Code/Editor/Util/PathUtil.h
index 0f87df0d5c..868d9843ab 100644
--- a/Code/Editor/Util/PathUtil.h
+++ b/Code/Editor/Util/PathUtil.h
@@ -228,7 +228,7 @@ namespace Path
{
return (path.endsWith(QStringLiteral("\\")) || path.endsWith(QStringLiteral("/")));
}
-
+
template
inline bool EndsWithSlash(CryStackStringT* path)
{
@@ -236,15 +236,15 @@ namespace Path
{
return false;
}
-
+
if (
((*path)[path->size() - 1] != '\\') ||
- ((*path)[path->size() - 1] != '/')
+ ((*path)[path->size() - 1] != '/')
)
{
return true;
}
-
+
return false;
}
@@ -336,9 +336,9 @@ namespace Path
{
char path_buffer[_MAX_PATH];
#ifdef AZ_COMPILER_MSVC
- _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), NULL, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
+ _makepath_s(path_buffer, AZ_ARRAY_SIZE(path_buffer), nullptr, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
#else
- _makepath(path_buffer, NULL, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
+ _makepath(path_buffer, nullptr, dir.toUtf8().data(), filename.toUtf8().data(), ext.toUtf8().data());
#endif
return CaselessPaths(path_buffer);
}
diff --git a/Code/Editor/Util/StringHelpers.cpp b/Code/Editor/Util/StringHelpers.cpp
index 836090e923..5d37dfef77 100644
--- a/Code/Editor/Util/StringHelpers.cpp
+++ b/Code/Editor/Util/StringHelpers.cpp
@@ -48,7 +48,7 @@ static inline int Vscprintf(const char* format, va_list argList)
int retval;
va_list argcopy;
va_copy(argcopy, argList);
- retval = azvsnprintf(NULL, 0, format, argcopy);
+ retval = azvsnprintf(nullptr, 0, format, argcopy);
va_end(argcopy);
return retval;
#else
@@ -64,7 +64,7 @@ static inline int Vscprintf(const wchar_t* format, va_list argList)
int retval;
va_list argcopy;
va_copy(argcopy, argList);
- retval = azvsnwprintf(NULL, 0, format, argcopy);
+ retval = azvsnwprintf(nullptr, 0, format, argcopy);
va_end(argcopy);
return retval;
#else
@@ -408,9 +408,9 @@ bool StringHelpers::MatchesWildcardsIgnoreCase(const wstring& str, const wstring
template
static inline bool MatchesWildcardsIgnoreCaseExt_Tpl(const TS& str, const TS& wildcards, std::vector& wildcardMatches)
{
- const typename TS::value_type* savedStrBegin = 0;
- const typename TS::value_type* savedStrEnd = 0;
- const typename TS::value_type* savedWild = 0;
+ const typename TS::value_type* savedStrBegin = nullptr;
+ const typename TS::value_type* savedStrEnd = nullptr;
+ const typename TS::value_type* savedWild = nullptr;
size_t savedWildCount = 0;
const typename TS::value_type* pStr = str.c_str();
@@ -775,7 +775,7 @@ void StringHelpers::SplitByAnyOf(const wstring& str, const wstring& separators,
template
static inline TS FormatVA_Tpl(const typename TS::value_type* const format, va_list parg)
{
- if ((format == 0) || (format[0] == 0))
+ if ((format == nullptr) || (format[0] == 0))
{
return TS();
}
@@ -935,8 +935,8 @@ static string ConvertUtf16ToMultibyte(const wchar_t* wstr, uint codePage, char b
len,
0,
0,
- ((badChar && codePage != CP_UTF8) ? &badChar : NULL),
- NULL);
+ ((badChar && codePage != CP_UTF8) ? &badChar : nullptr),
+ nullptr);
if (neededByteCount <= 0)
{
return string();
@@ -952,8 +952,8 @@ static string ConvertUtf16ToMultibyte(const wchar_t* wstr, uint codePage, char b
len,
&buffer[0], // output buffer
neededByteCount - 1, // size of the output buffer in bytes
- ((badChar && codePage != CP_UTF8) ? &badChar : NULL),
- NULL);
+ ((badChar && codePage != CP_UTF8) ? &badChar : nullptr),
+ nullptr);
if (byteCount != neededByteCount - 1)
{
return string();
diff --git a/Code/Editor/Util/UIEnumerations.cpp b/Code/Editor/Util/UIEnumerations.cpp
index 8d9fc40377..2666a49f8e 100644
--- a/Code/Editor/Util/UIEnumerations.cpp
+++ b/Code/Editor/Util/UIEnumerations.cpp
@@ -55,15 +55,15 @@ CUIEnumerations::TDValuesContainer& CUIEnumerations::GetStandardNameContainer()
{
oEnumerationItem = oEnumaration->getChild(nCurrentEnumarationItem);
- const char* szKey(NULL);
- const char* szValue(NULL);
+ const char* szKey(nullptr);
+ const char* szValue(nullptr);
oEnumerationItem->getAttributeByIndex(0, &szKey, &szValue);
cValues.push_back(szValue);
}
- const char* szKey(NULL);
- const char* szValue(NULL);
+ const char* szKey(nullptr);
+ const char* szValue(nullptr);
oEnumaration->getAttributeByIndex(0, &szKey, &szValue);
cValuesContainer.insert(TDValuesContainer::value_type(szValue, cValues));
diff --git a/Code/Editor/Util/Variable.cpp b/Code/Editor/Util/Variable.cpp
index 5125032baf..ee5ccc9879 100644
--- a/Code/Editor/Util/Variable.cpp
+++ b/Code/Editor/Util/Variable.cpp
@@ -447,7 +447,7 @@ void CVarObject::AddVariable(CVariableArray& table, CVariableBase& var, const QS
//////////////////////////////////////////////////////////////////////////
void CVarObject::RemoveVariable(IVariable* var)
{
- if (m_vars != NULL)
+ if (m_vars != nullptr)
{
m_vars->DeleteVariable(var);
}
@@ -455,7 +455,7 @@ void CVarObject::RemoveVariable(IVariable* var)
//////////////////////////////////////////////////////////////////////////
void CVarObject::EnableUpdateCallbacks(bool boEnable)
{
- if (m_vars != NULL)
+ if (m_vars != nullptr)
{
m_vars->EnableUpdateCallbacks(boEnable);
}
@@ -463,7 +463,7 @@ void CVarObject::EnableUpdateCallbacks(bool boEnable)
//////////////////////////////////////////////////////////////////////////
void CVarObject::OnSetValues()
{
- if (m_vars != NULL)
+ if (m_vars != nullptr)
{
m_vars->OnSetValues();
}
@@ -471,7 +471,7 @@ void CVarObject::OnSetValues()
//////////////////////////////////////////////////////////////////////////
void CVarObject::ReserveNumVariables(int numVars)
{
- if (m_vars != NULL)
+ if (m_vars != nullptr)
{
m_vars->ReserveNumVariables(numVars);
}
@@ -482,7 +482,7 @@ void CVarObject::CopyVariableValues(CVarObject* sourceObject)
{
// Check if compatible types.
assert(metaObject() == sourceObject->metaObject());
- if (m_vars != NULL && sourceObject->m_vars != NULL)
+ if (m_vars != nullptr && sourceObject->m_vars != nullptr)
{
m_vars->CopyValues(sourceObject->m_vars);
}
diff --git a/Code/Editor/Util/Variable.h b/Code/Editor/Util/Variable.h
index 0d1e7a9ef1..83afee0924 100644
--- a/Code/Editor/Util/Variable.h
+++ b/Code/Editor/Util/Variable.h
@@ -1411,7 +1411,7 @@ protected:
struct IVarEnumList
: public CRefCountBase
{
- //! Get the name of specified value in enumeration, or NULL if out of range.
+ //! Get the name of specified value in enumeration, or empty string if out of range.
virtual QString GetItemName(uint index) = 0;
};
typedef _smart_ptr IVarEnumListPtr;
@@ -1498,7 +1498,7 @@ public:
{
if (index >= m_items.size())
{
- return NULL;
+ return QString();
}
return m_items[index].name;
};
@@ -1869,9 +1869,9 @@ public:
void Serialize(XmlNodeRef node, bool load);
CVarBlock* GetVarBlock() const { return m_vars; };
- void AddVariable(CVariableBase& var, const QString& varName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
- void AddVariable(CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
- void AddVariable(CVariableArray& table, CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = NULL, unsigned char dataType = IVariable::DT_SIMPLE);
+ void AddVariable(CVariableBase& var, const QString& varName, VarOnSetCallback* cb = nullptr, unsigned char dataType = IVariable::DT_SIMPLE);
+ void AddVariable(CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = nullptr, unsigned char dataType = IVariable::DT_SIMPLE);
+ void AddVariable(CVariableArray& table, CVariableBase& var, const QString& varName, const QString& varHumanName, VarOnSetCallback* cb = nullptr, unsigned char dataType = IVariable::DT_SIMPLE);
void ReserveNumVariables(int numVars);
void RemoveVariable(IVariable* var);
diff --git a/Code/Editor/Util/VariablePropertyType.cpp b/Code/Editor/Util/VariablePropertyType.cpp
index c6d26b3470..014995467b 100644
--- a/Code/Editor/Util/VariablePropertyType.cpp
+++ b/Code/Editor/Util/VariablePropertyType.cpp
@@ -71,28 +71,28 @@ namespace Prop
Description::Description()
: m_type(ePropertyInvalid)
, m_numImages(-1)
- , m_enumList(NULL)
+ , m_enumList(nullptr)
, m_rangeMin(0)
, m_rangeMax(100)
, m_step(0)
, m_bHardMin(false)
, m_bHardMax(false)
, m_valueMultiplier(1)
- , m_pEnumDBItem(NULL)
+ , m_pEnumDBItem(nullptr)
{
}
Description::Description(IVariable* pVar)
: m_type(ePropertyInvalid)
, m_numImages(-1)
- , m_enumList(NULL)
+ , m_enumList(nullptr)
, m_rangeMin(0)
, m_rangeMax(100)
, m_step(0)
, m_bHardMin(false)
, m_bHardMax(false)
, m_valueMultiplier(1)
- , m_pEnumDBItem(NULL)
+ , m_pEnumDBItem(nullptr)
{
if (!pVar)
{
@@ -110,7 +110,7 @@ namespace Prop
m_name = pVar->GetHumanName();
m_enumList = pVar->GetEnumList();
- if (m_enumList != NULL)
+ if (m_enumList != nullptr)
{
m_type = ePropertySelection;
}
@@ -325,7 +325,7 @@ namespace Prop
case ePropertyAudioPreloadRequest:
return "AudioPreloadRequest";
default:
- return 0;
+ return nullptr;
}
}
}
diff --git a/Code/Editor/Util/XmlHistoryManager.cpp b/Code/Editor/Util/XmlHistoryManager.cpp
index 3aea041d29..ed92700705 100644
--- a/Code/Editor/Util/XmlHistoryManager.cpp
+++ b/Code/Editor/Util/XmlHistoryManager.cpp
@@ -76,7 +76,7 @@ const XmlNodeRef& SXmlHistory::GetCurrentVersion(bool* bVersionExist, int* iVers
bool SXmlHistory::IsModified() const
{
int currVersion;
- GetCurrentVersion(NULL, &currVersion);
+ GetCurrentVersion(nullptr, &currVersion);
return m_SavedVersion != currVersion;
}
@@ -94,7 +94,7 @@ void SXmlHistory::FlagAsSaved()
if (Exist())
{
int currVersion;
- GetCurrentVersion(NULL, &currVersion);
+ GetCurrentVersion(nullptr, &currVersion);
m_SavedVersion = currVersion;
}
}
@@ -167,7 +167,7 @@ SXmlHistory* SXmlHistoryGroup::GetHistory(int index) const
--index;
}
}
- return it != m_List.end() ? *it : NULL;
+ return it != m_List.end() ? *it : nullptr;
}
////////////////////////////////////////////////////////////////////////////
@@ -199,7 +199,7 @@ SXmlHistory* SXmlHistoryGroup::GetHistoryByTypeId(uint32 typeId, int index /*= 0
return pHistory;
}
}
- return NULL;
+ return nullptr;
}
////////////////////////////////////////////////////////////////////////////
@@ -246,9 +246,9 @@ int SXmlHistoryGroup::GetHistoryIndex(const SXmlHistory* pHistory) const
CXmlHistoryManager::CXmlHistoryManager()
: m_CurrentVersion(0)
, m_LatestVersion(0)
- , m_pExclusiveListener(NULL)
+ , m_pExclusiveListener(nullptr)
, m_RecordNextVersion(false)
- , m_pExActiveGroup(NULL)
+ , m_pExActiveGroup(nullptr)
, m_bIsActiveGroupEx(false)
{
m_pNullGroup = new SXmlHistoryGroup(this, (uint32) - 1);
@@ -376,7 +376,7 @@ void CXmlHistoryManager::PrepareForNextVersion()
}
/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc /*= NULL*/)
+void CXmlHistoryManager::RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc /*= nullptr*/)
{
assert(m_RecordNextVersion);
RegisterUndoEventHandler(this, pHistory);
@@ -405,7 +405,7 @@ void CXmlHistoryManager::ClearHistory(bool flagAsSaved)
it->ClearHistory(flagAsSaved);
}
- SetActiveGroup(NULL);
+ SetActiveGroup(nullptr);
m_CurrentVersion = 0;
m_LatestVersion = 0;
@@ -451,14 +451,14 @@ SXmlHistoryGroup* CXmlHistoryManager::CreateXmlGroup(uint32 typeId)
}
/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= NULL*/)
+void CXmlHistoryManager::AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= nullptr*/)
{
RecordUndoInternal(undoDesc ? undoDesc : "New XML Group added");
m_HistoryInfoMap[ m_CurrentVersion ].ActiveGroups.push_back(pGroup);
NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupAdded, (void*)pGroup);
}
/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= NULL*/)
+void CXmlHistoryManager::RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc /*= nullptr*/)
{
bool unload = m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup == pGroup;
RecordUndoInternal(undoDesc ? undoDesc : "XML Group deleted");
@@ -466,14 +466,14 @@ void CXmlHistoryManager::RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const ch
stl::find_and_erase(list, pGroup);
if (unload)
{
- SetActiveGroupInt(NULL);
+ SetActiveGroupInt(nullptr);
}
m_HistoryInfoMap[ m_CurrentVersion ].CurrGroup = m_pNullGroup;
NotifyUndoEventListener(IXmlHistoryEventListener::eHET_HistoryGroupRemoved, (void*)pGroup);
}
/////////////////////////////////////////////////////////////////////////////
-void CXmlHistoryManager::SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName /*= NULL*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/, bool setExternal /*= false*/)
+void CXmlHistoryManager::SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName /*= nullptr*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/, bool setExternal /*= false*/)
{
TGroupIndexMap userIndex;
const SXmlHistoryGroup* pActiveGroup = GetActiveGroup(userIndex);
@@ -488,7 +488,7 @@ void CXmlHistoryManager::SetActiveGroup(const SXmlHistoryGroup* pGroup, const ch
}
}
-void CXmlHistoryManager::SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName /*= NULL*/, bool bRecordNullUndo /*= false*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/)
+void CXmlHistoryManager::SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName /*= nullptr*/, bool bRecordNullUndo /*= false*/, const TGroupIndexMap& groupIndex /*= TGroupIndexMap()*/)
{
UnloadInt();
@@ -511,7 +511,7 @@ void CXmlHistoryManager::SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const
userIndexCount[ (*history)->GetTypeId() ] = 0;
}
uint32 userindex = userIndexCount[ (*history)->GetTypeId() ];
- IXmlUndoEventHandler* pEventHandler = NULL;
+ IXmlUndoEventHandler* pEventHandler = nullptr;
TGroupIndexMap::const_iterator indexIter = groupIndex.find((*history)->GetTypeId());
if (indexIter == groupIndex.end() || indexIter->second == userindex)
{
@@ -581,12 +581,12 @@ const SXmlHistoryGroup* CXmlHistoryManager::GetActiveGroup(TGroupIndexMap& currU
if (it != m_HistoryInfoMap.end() && pGroup)
{
currUserIndex = it->second.CurrUserIndex;
- return pGroup == m_pNullGroup ? NULL : pGroup;
+ return pGroup == m_pNullGroup ? nullptr : pGroup;
}
}
currVersion--;
} while (currVersion >= 0);
- return NULL;
+ return nullptr;
}
/////////////////////////////////////////////////////////////////////////////
@@ -796,7 +796,7 @@ SXmlHistory* CXmlHistoryManager::GetLatestHistory(SUndoEventHandlerData& eventHa
}
currVersion--;
} while (currVersion >= 0);
- return NULL;
+ return nullptr;
}
diff --git a/Code/Editor/Util/XmlHistoryManager.h b/Code/Editor/Util/XmlHistoryManager.h
index d894bc7f00..d7aae71939 100644
--- a/Code/Editor/Util/XmlHistoryManager.h
+++ b/Code/Editor/Util/XmlHistoryManager.h
@@ -23,9 +23,9 @@ public:
void AddToHistory(const XmlNodeRef& newXmlVersion);
- const XmlNodeRef& Undo(bool* bVersionExist = NULL);
+ const XmlNodeRef& Undo(bool* bVersionExist = nullptr);
const XmlNodeRef& Redo();
- const XmlNodeRef& GetCurrentVersion(bool* bVersionExist = NULL, int* iVersionNumber = NULL) const;
+ const XmlNodeRef& GetCurrentVersion(bool* bVersionExist = nullptr, int* iVersionNumber = nullptr) const;
bool IsModified() const;
uint32 GetTypeId() const {return m_typeId; }
void FlagAsDeleted();
@@ -93,7 +93,7 @@ public:
void RestoreUndoEventHandler(IXmlUndoEventHandler* pEventHandler, uint32 typeId);
void PrepareForNextVersion();
- void RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc = NULL);
+ void RecordNextVersion(SXmlHistory* pHistory, XmlNodeRef newData, const char* undoDesc = nullptr);
bool IsPreparedForNextVersion() const {return m_RecordNextVersion; }
void RegisterEventListener(IXmlHistoryEventListener* pEventListener);
@@ -112,11 +112,11 @@ public:
// Xml History Groups
SXmlHistoryGroup* CreateXmlGroup(uint32 typeId);
- void SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName = NULL, const TGroupIndexMap& groupIndex = TGroupIndexMap(), bool setExternal = false);
+ void SetActiveGroup(const SXmlHistoryGroup* pGroup, const char* displayName = nullptr, const TGroupIndexMap& groupIndex = TGroupIndexMap(), bool setExternal = false);
const SXmlHistoryGroup* GetActiveGroup() const;
const SXmlHistoryGroup* GetActiveGroup(TGroupIndexMap& currUserIndex /*out*/) const;
- void AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = NULL);
- void RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = NULL);
+ void AddXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = nullptr);
+ void RemoveXmlGroup(const SXmlHistoryGroup* pGroup, const char* undoDesc = nullptr);
void DeleteAll();
@@ -156,7 +156,7 @@ private:
{
SHistoryInfo()
: IsNullUndo(false)
- , CurrGroup(NULL)
+ , CurrGroup(nullptr)
, HistoryInvalidated(false) {}
const SXmlHistoryGroup* CurrGroup;
@@ -174,7 +174,7 @@ private:
struct SUndoEventHandlerData
{
SUndoEventHandlerData()
- : CurrentData(NULL) {}
+ : CurrentData(nullptr) {}
SXmlHistory* CurrentData;
THistoryVersionMap HistoryData;
@@ -203,9 +203,9 @@ private:
void RecordNullUndo(const TEventHandlerList& eventHandler, const char* desc, bool isNull = true);
void ReloadCurrentVersion(const SXmlHistoryGroup* pPrevGroup, int prevVersion);
SXmlHistory* GetLatestHistory(SUndoEventHandlerData& eventHandlerData);
- void NotifyUndoEventListener(IXmlHistoryEventListener::EHistoryEventType event, void* pData = NULL);
+ void NotifyUndoEventListener(IXmlHistoryEventListener::EHistoryEventType event, void* pData = nullptr);
- void SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName = NULL, bool bRecordNullUndo = false, const TGroupIndexMap& groupIndex = TGroupIndexMap());
+ void SetActiveGroupInt(const SXmlHistoryGroup* pGroup, const char* displayName = nullptr, bool bRecordNullUndo = false, const TGroupIndexMap& groupIndex = TGroupIndexMap());
void UnloadInt();
void ClearRedo();
diff --git a/Code/Editor/Util/XmlTemplate.cpp b/Code/Editor/Util/XmlTemplate.cpp
index 1b0cc6ff6f..8acdd4973f 100644
--- a/Code/Editor/Util/XmlTemplate.cpp
+++ b/Code/Editor/Util/XmlTemplate.cpp
@@ -89,7 +89,7 @@ void CXmlTemplate::SetValues(const XmlNodeRef& node, XmlNodeRef& toNode)
}
else
{
- assert(!"NULL returned from node->GetChild()");
+ assert(!"nullptr returned from node->GetChild()");
}
}
}
@@ -125,7 +125,7 @@ bool CXmlTemplate::SetValues(const XmlNodeRef& node, XmlNodeRef& toNode, const X
}
else
{
- assert(!"NULL returned from node->GetChild()");
+ assert(!"nullptr returned from node->GetChild()");
}
}
return false;
@@ -193,7 +193,7 @@ void CXmlTemplateRegistry::LoadTemplates(const QString& path)
XmlNodeRef child;
// Construct the full filepath of the current file
XmlNodeRef node = XmlHelpers::LoadXmlFromFile((dir + files[k].filename).toUtf8().data());
- if (node != 0 && node->isTag("Templates"))
+ if (node != nullptr && node->isTag("Templates"))
{
QString name;
for (int i = 0; i < node->getChildCount(); i++)
@@ -220,5 +220,5 @@ XmlNodeRef CXmlTemplateRegistry::FindTemplate(const QString& name)
{
return node;
}
- return 0;
+ return nullptr;
}
diff --git a/Code/Editor/Util/bitarray.h b/Code/Editor/Util/bitarray.h
index c7d7f2012a..f55d195fd1 100644
--- a/Code/Editor/Util/bitarray.h
+++ b/Code/Editor/Util/bitarray.h
@@ -74,7 +74,7 @@ public:
void flip() {* p ^= mask; }
};
- CBitArray() { m_base = NULL; m_bits = NULL; m_size = 0; m_numBits = 0; };
+ CBitArray() { m_base = nullptr; m_bits = nullptr; m_size = 0; m_numBits = 0; };
CBitArray(int numBits) { resize(numBits); };
~CBitArray()
{
diff --git a/Code/Editor/ViewManager.cpp b/Code/Editor/ViewManager.cpp
index 7277a0f4f3..480a99a9d9 100644
--- a/Code/Editor/ViewManager.cpp
+++ b/Code/Editor/ViewManager.cpp
@@ -52,7 +52,7 @@ CViewManager::CViewManager()
m_updateRegion.min = Vec3(-100000, -100000, -100000);
m_updateRegion.max = Vec3(100000, 100000, 100000);
- m_pSelectedView = NULL;
+ m_pSelectedView = nullptr;
m_nGameViewports = 0;
m_bGameViewportsUpdated = false;
@@ -107,7 +107,7 @@ void CViewManager::UnregisterViewport(CViewport* pViewport)
{
if (m_pSelectedView == pViewport)
{
- m_pSelectedView = NULL;
+ m_pSelectedView = nullptr;
}
stl::find_and_erase(m_viewports, pViewport);
m_bGameViewportsUpdated = false;
@@ -127,7 +127,7 @@ CViewport* CViewManager::GetViewport(EViewportType type) const
return m_viewports[i];
}
}
- return 0;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -140,7 +140,7 @@ CViewport* CViewManager::GetViewport(const QString& name) const
return m_viewports[i];
}
}
- return 0;
+ return nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -224,7 +224,7 @@ void CViewManager::SelectViewport(CViewport* pViewport)
{
// Audio: Handle viewport change for listeners
- if (m_pSelectedView != NULL && m_pSelectedView != pViewport)
+ if (m_pSelectedView != nullptr && m_pSelectedView != pViewport)
{
m_pSelectedView->SetSelected(false);
@@ -232,7 +232,7 @@ void CViewManager::SelectViewport(CViewport* pViewport)
m_pSelectedView = pViewport;
- if (m_pSelectedView != NULL)
+ if (m_pSelectedView != nullptr)
{
m_pSelectedView->SetSelected(true);
}
diff --git a/Code/Editor/ViewManager.h b/Code/Editor/ViewManager.h
index 22f9f6804f..5b84efd197 100644
--- a/Code/Editor/ViewManager.h
+++ b/Code/Editor/ViewManager.h
@@ -86,14 +86,14 @@ public:
//////////////////////////////////////////////////////////////////////////
//! Get number of currently existing viewports.
- virtual int GetViewCount() { return m_viewports.size(); };
+ virtual int GetViewCount() { return static_cast(m_viewports.size()); };
//! Get viewport by index.
//! @param index 0 <= index < GetViewportCount()
virtual CViewport* GetView(int index) { return m_viewports[index]; }
//////////////////////////////////////////////////////////////////////////
//! Get current layout window.
- //! @return Pointer to the layout window, can be NULL.
+ //! @return Pointer to the layout window, can be nullptr.
virtual CLayoutWnd* GetLayout() const;
//! Cycle between different 2D viewports type on same view pane.
diff --git a/Code/Editor/ViewPane.cpp b/Code/Editor/ViewPane.cpp
index b4af87775c..466274c06e 100644
--- a/Code/Editor/ViewPane.cpp
+++ b/Code/Editor/ViewPane.cpp
@@ -159,8 +159,8 @@ CLayoutViewPane::CLayoutViewPane(QWidget* parent)
, m_viewportTitleDlg(this)
, m_expanderWatcher(new ViewportTitleExpanderWatcher(this, &m_viewportTitleDlg))
{
- m_viewport = 0;
- m_active = 0;
+ m_viewport = nullptr;
+ m_active = false;
m_nBorder = VIEW_BORDER;
m_bFullscreen = false;
@@ -334,7 +334,7 @@ void CLayoutViewPane::DetachViewport()
{
DisconnectRenderViewportInteractionRequestBus();
OnFOVChanged(gSettings.viewports.fDefaultFov);
- m_viewport = 0;
+ m_viewport = nullptr;
}
//////////////////////////////////////////////////////////////////////////
@@ -344,7 +344,7 @@ void CLayoutViewPane::ReleaseViewport()
{
DisconnectRenderViewportInteractionRequestBus();
m_viewport->deleteLater();
- m_viewport = 0;
+ m_viewport = nullptr;
}
}
diff --git a/Code/Editor/Viewport.cpp b/Code/Editor/Viewport.cpp
index ba310cb52d..2bc1b21216 100644
--- a/Code/Editor/Viewport.cpp
+++ b/Code/Editor/Viewport.cpp
@@ -191,7 +191,7 @@ QtViewport::QtViewport(QWidget* parent)
}
m_screenTM.SetIdentity();
- m_pMouseOverObject = 0;
+ m_pMouseOverObject = nullptr;
m_bAdvancedSelectMode = false;
@@ -397,7 +397,7 @@ void QtViewport::OnDeactivate()
//////////////////////////////////////////////////////////////////////////
void QtViewport::ResetContent()
{
- m_pMouseOverObject = 0;
+ m_pMouseOverObject = nullptr;
// Need to clear visual object cache.
// Right after loading new level, some code(e.g. OnMouseMove) access invalid
diff --git a/Code/Editor/Viewport.h b/Code/Editor/Viewport.h
index 5b4f23fd2b..823b8c77b1 100644
--- a/Code/Editor/Viewport.h
+++ b/Code/Editor/Viewport.h
@@ -113,7 +113,7 @@ public:
virtual void AddPostRenderer(IPostRenderer* pPostRenderer) = 0;
virtual bool RemovePostRenderer(IPostRenderer* pPostRenderer) = 0;
- virtual BOOL DestroyWindow() { return FALSE; }
+ virtual bool DestroyWindow() { return false; }
/** Get type of this viewport.
*/
@@ -260,7 +260,7 @@ public:
virtual void SetCursorString(const QString& str) = 0;
virtual void SetFocus() = 0;
- virtual void Invalidate(BOOL bErase = 1) = 0;
+ virtual void Invalidate(bool bErase = 1) = 0;
// Is overridden by RenderViewport
virtual void SetFOV([[maybe_unused]] float fov) {}
@@ -274,8 +274,8 @@ public:
void SetViewPane(CLayoutViewPane* viewPane) { m_viewPane = viewPane; }
//Child classes can override these to provide extra logic that wraps
- //widget rendering. Needed by the RenderViewport to handle raycasts
- //from screen-space to world-space.
+ //widget rendering. Needed by the RenderViewport to handle raycasts
+ //from screen-space to world-space.
virtual void PreWidgetRendering() {}
virtual void PostWidgetRendering() {}
@@ -352,7 +352,7 @@ public:
QString GetName() const;
virtual void SetFocus() { setFocus(); }
- virtual void Invalidate([[maybe_unused]] BOOL bErase = 1) { update(); }
+ virtual void Invalidate([[maybe_unused]] bool bErase = 1) { update(); }
// Is overridden by RenderViewport
virtual void SetFOV([[maybe_unused]] float fov) {}
diff --git a/Code/Editor/ViewportTitleDlg.cpp b/Code/Editor/ViewportTitleDlg.cpp
index 6d2d91f546..50479beee0 100644
--- a/Code/Editor/ViewportTitleDlg.cpp
+++ b/Code/Editor/ViewportTitleDlg.cpp
@@ -91,7 +91,7 @@ namespace
void ViewportInfoStatusUpdated(int newIndex);
private:
- void OnViewportInfoDisplayStateChanged(AZ::AtomBridge::ViewportInfoDisplayState state)
+ void OnViewportInfoDisplayStateChanged(AZ::AtomBridge::ViewportInfoDisplayState state) override
{
emit ViewportInfoStatusUpdated(static_cast(state));
}
@@ -971,13 +971,13 @@ void CViewportTitleDlg::CheckForCameraSpeedUpdate()
void CViewportTitleDlg::OnGridSnappingToggled()
{
m_gridSizeActionWidget->setEnabled(m_enableGridSnappingAction->isChecked());
- MainWindow::instance()->GetActionManager()->GetAction(ID_SNAP_TO_GRID)->trigger();
+ MainWindow::instance()->GetActionManager()->GetAction(AzToolsFramework::SnapToGrid)->trigger();
}
void CViewportTitleDlg::OnAngleSnappingToggled()
{
m_angleSizeActionWidget->setEnabled(m_enableAngleSnappingAction->isChecked());
- MainWindow::instance()->GetActionManager()->GetAction(ID_SNAPANGLE)->trigger();
+ MainWindow::instance()->GetActionManager()->GetAction(AzToolsFramework::SnapAngle)->trigger();
}
void CViewportTitleDlg::OnGridSpinBoxChanged(double value)
@@ -992,14 +992,14 @@ void CViewportTitleDlg::OnAngleSpinBoxChanged(double value)
void CViewportTitleDlg::UpdateOverFlowMenuState()
{
- bool gridSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(ID_SNAP_TO_GRID)->isChecked();
+ bool gridSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(AzToolsFramework::SnapToGrid)->isChecked();
{
QSignalBlocker signalBlocker(m_enableGridSnappingAction);
m_enableGridSnappingAction->setChecked(gridSnappingActive);
}
m_gridSizeActionWidget->setEnabled(gridSnappingActive);
- bool angleSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(ID_SNAPANGLE)->isChecked();
+ bool angleSnappingActive = MainWindow::instance()->GetActionManager()->GetAction(AzToolsFramework::SnapAngle)->isChecked();
{
QSignalBlocker signalBlocker(m_enableAngleSnappingAction);
m_enableAngleSnappingAction->setChecked(angleSnappingActive);
diff --git a/Code/Editor/WipFeatureManager.cpp b/Code/Editor/WipFeatureManager.cpp
index 6777065c1c..f6fbc7ac93 100644
--- a/Code/Editor/WipFeatureManager.cpp
+++ b/Code/Editor/WipFeatureManager.cpp
@@ -19,7 +19,7 @@ const char* CWipFeatureManager::kWipFeaturesFilename = "@user@\\Editor\\UI\\WipF
#else
const char* CWipFeatureManager::kWipFeaturesFilename = "@user@/Editor/UI/WipFeatures.xml";
#endif
-CWipFeatureManager* CWipFeatureManager::s_pInstance = NULL;
+CWipFeatureManager* CWipFeatureManager::s_pInstance = nullptr;
static void WipFeatureVarChange(ICVar* pVar)
{
@@ -162,7 +162,7 @@ void CWipFeatureManager::Shutdown()
{
CWipFeatureManager::Instance()->Save();
delete s_pInstance;
- s_pInstance = NULL;
+ s_pInstance = nullptr;
}
bool CWipFeatureManager::Load(const char* pFilename, bool bClearExisting)
@@ -350,7 +350,7 @@ void CWipFeatureManager::ShowFeature(int aFeatureId, bool bShow)
if (m_features[aFeatureId].m_pfnUpdateFeature)
{
- m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bShow, NULL, NULL, NULL);
+ m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, &bShow, nullptr, nullptr, nullptr);
}
}
@@ -360,7 +360,7 @@ void CWipFeatureManager::EnableFeature(int aFeatureId, bool bEnable)
if (m_features[aFeatureId].m_pfnUpdateFeature)
{
- m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, &bEnable, NULL, NULL);
+ m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, nullptr, &bEnable, nullptr, nullptr);
}
}
@@ -370,7 +370,7 @@ void CWipFeatureManager::SetFeatureSafeMode(int aFeatureId, bool bSafeMode)
if (m_features[aFeatureId].m_pfnUpdateFeature)
{
- m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, NULL, &bSafeMode, NULL);
+ m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, nullptr, nullptr, &bSafeMode, nullptr);
}
}
@@ -380,7 +380,7 @@ void CWipFeatureManager::SetFeatureParams(int aFeatureId, const char* pParams)
if (m_features[aFeatureId].m_pfnUpdateFeature)
{
- m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, NULL, NULL, NULL, pParams);
+ m_features[aFeatureId].m_pfnUpdateFeature(aFeatureId, nullptr, nullptr, nullptr, pParams);
}
}
@@ -392,7 +392,7 @@ void CWipFeatureManager::ShowAllFeatures(bool bShow)
if (iter->second.m_pfnUpdateFeature)
{
- iter->second.m_pfnUpdateFeature(iter->first, &bShow, NULL, NULL, NULL);
+ iter->second.m_pfnUpdateFeature(iter->first, &bShow, nullptr, nullptr, nullptr);
}
}
}
@@ -405,7 +405,7 @@ void CWipFeatureManager::EnableAllFeatures(bool bEnable)
if (iter->second.m_pfnUpdateFeature)
{
- iter->second.m_pfnUpdateFeature(iter->first, NULL, &bEnable, NULL, NULL);
+ iter->second.m_pfnUpdateFeature(iter->first, nullptr, &bEnable, nullptr, nullptr);
}
}
}
@@ -418,7 +418,7 @@ void CWipFeatureManager::SetAllFeaturesSafeMode(bool bSafeMode)
if (iter->second.m_pfnUpdateFeature)
{
- iter->second.m_pfnUpdateFeature(iter->first, NULL, NULL, &bSafeMode, NULL);
+ iter->second.m_pfnUpdateFeature(iter->first, nullptr, nullptr, &bSafeMode, nullptr);
}
}
}
@@ -431,7 +431,7 @@ void CWipFeatureManager::SetAllFeaturesParams(const char* pParams)
if (iter->second.m_pfnUpdateFeature)
{
- iter->second.m_pfnUpdateFeature(iter->first, NULL, NULL, NULL, pParams);
+ iter->second.m_pfnUpdateFeature(iter->first, nullptr, nullptr, nullptr, pParams);
}
}
}
diff --git a/Code/Editor/WipFeatureManager.h b/Code/Editor/WipFeatureManager.h
index 52ed364524..cd20f6d591 100644
--- a/Code/Editor/WipFeatureManager.h
+++ b/Code/Editor/WipFeatureManager.h
@@ -48,7 +48,7 @@ public:
static const char* kWipFeaturesFilename;
// Used to register a callback function to update the state of features whitin the editor
- // pbVisible, pbEnabled, pbSafeMode, pParams - if the pointer is NULL, then that attribute was not changed
+ // pbVisible, pbEnabled, pbSafeMode, pParams - if the pointer is nullptr, then that attribute was not changed
typedef void (* TWipFeatureUpdateCallback)(int aFeatureId, const bool* const pbVisible, const bool* const pbEnabled, const bool* const pbSafeMode, const char* pParams);
// wip feature registerer auto create object, used for static auto feature creation with the REGISTER_WIP_FEATURE macro
@@ -71,7 +71,7 @@ public:
, m_bVisible(true)
, m_bEnabled(true)
, m_bSafeMode(false)
- , m_pfnUpdateFeature(NULL)
+ , m_pfnUpdateFeature(nullptr)
, m_bLoadedFromXml(false)
{}
diff --git a/Code/Editor/WipFeaturesDlg.cpp b/Code/Editor/WipFeaturesDlg.cpp
index 8a5c323fa5..0d0a179539 100644
--- a/Code/Editor/WipFeaturesDlg.cpp
+++ b/Code/Editor/WipFeaturesDlg.cpp
@@ -152,7 +152,7 @@ public:
}
};
-CWipFeaturesDlg::CWipFeaturesDlg(QWidget* pParent /*=NULL*/)
+CWipFeaturesDlg::CWipFeaturesDlg(QWidget* pParent /*=nullptr*/)
: QDialog(pParent)
, m_ui(new Ui::WipFeaturesDlg)
{
diff --git a/Code/Editor/WipFeaturesDlg.h b/Code/Editor/WipFeaturesDlg.h
index 03b3654a27..28f4f43958 100644
--- a/Code/Editor/WipFeaturesDlg.h
+++ b/Code/Editor/WipFeaturesDlg.h
@@ -29,7 +29,7 @@ class CWipFeaturesDlg
{
Q_OBJECT
public:
- CWipFeaturesDlg(QWidget* pParent = NULL); // standard constructor
+ CWipFeaturesDlg(QWidget* pParent = nullptr); // standard constructor
virtual ~CWipFeaturesDlg();
private:
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
index 6e46b930b6..f358370be5 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/BlockCache.cpp
@@ -47,7 +47,7 @@ namespace AZ
}
auto stackEntry = AZStd::make_shared(
- cacheSize, blockSize, aznumeric_caster(hardware.m_maxPhysicalSectorSize), false);
+ cacheSize, aznumeric_cast(blockSize), aznumeric_cast(hardware.m_maxPhysicalSectorSize), false);
stackEntry->SetNext(AZStd::move(parent));
return stackEntry;
}
diff --git a/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
index 5b67c8c255..6ec3fb295c 100644
--- a/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
+++ b/Code/Framework/AzCore/AzCore/IO/Streamer/DedicatedCache.cpp
@@ -45,7 +45,7 @@ namespace AZ
}
auto stackEntry = AZStd::make_shared(
- cacheSize, blockSize, aznumeric_caster(hardware.m_maxPhysicalSectorSize), m_writeOnlyEpilog);
+ cacheSize, aznumeric_cast(blockSize), aznumeric_cast(hardware.m_maxPhysicalSectorSize), m_writeOnlyEpilog);
stackEntry->SetNext(AZStd::move(parent));
return stackEntry;
}
diff --git a/Code/Framework/AzCore/AzCore/Math/Aabb.h b/Code/Framework/AzCore/AzCore/Math/Aabb.h
index 8d8ded7b2d..488808bc4c 100644
--- a/Code/Framework/AzCore/AzCore/Math/Aabb.h
+++ b/Code/Framework/AzCore/AzCore/Math/Aabb.h
@@ -43,7 +43,7 @@ namespace AZ
static Aabb CreateCenterRadius(const Vector3& center, float radius);
//! Creates an AABB which contains the specified points.
- static Aabb CreatePoints(const Vector3* pts, int numPts);
+ static Aabb CreatePoints(const Vector3* pts, size_t numPts);
//! Creates an AABB which contains the specified OBB.
static Aabb CreateFromObb(const Obb& obb);
diff --git a/Code/Framework/AzCore/AzCore/Math/Aabb.inl b/Code/Framework/AzCore/AzCore/Math/Aabb.inl
index 5806857bb1..3ce7b99792 100644
--- a/Code/Framework/AzCore/AzCore/Math/Aabb.inl
+++ b/Code/Framework/AzCore/AzCore/Math/Aabb.inl
@@ -60,10 +60,10 @@ namespace AZ
}
- AZ_MATH_INLINE Aabb Aabb::CreatePoints(const Vector3* pts, int numPts)
+ AZ_MATH_INLINE Aabb Aabb::CreatePoints(const Vector3* pts, size_t numPts)
{
Aabb aabb = Aabb::CreateFromPoint(pts[0]);
- for (int i = 1; i < numPts; ++i)
+ for (size_t i = 1; i < numPts; ++i)
{
aabb.AddPoint(pts[i]);
}
diff --git a/Code/Framework/AzCore/AzCore/Module/Environment.cpp b/Code/Framework/AzCore/AzCore/Module/Environment.cpp
index f3a3533f4a..bec530e2d1 100644
--- a/Code/Framework/AzCore/AzCore/Module/Environment.cpp
+++ b/Code/Framework/AzCore/AzCore/Module/Environment.cpp
@@ -11,6 +11,7 @@
#include
#include
#include
+#include
namespace AZ
{
@@ -75,6 +76,42 @@ namespace AZ
bool operator==(const OSStdAllocator& a, const OSStdAllocator& b) { (void)a; (void)b; return true; }
bool operator!=(const OSStdAllocator& a, const OSStdAllocator& b) { (void)a; (void)b; return false; }
+ void EnvironmentVariableHolderBase::UnregisterAndDestroy(DestructFunc destruct, bool moduleRelease)
+ {
+ const bool releaseByUseCount = (--m_useCount == 0);
+ // We take over the lock, and release it before potentially destroying/freeing ourselves
+ {
+ AZStd::scoped_lock envLockHolder(AZStd::adopt_lock, m_mutex);
+ const bool releaseByModule = (moduleRelease && !m_canTransferOwnership && m_moduleOwner == AZ::Environment::GetModuleId());
+
+ if (!releaseByModule && !releaseByUseCount)
+ {
+ return;
+ }
+ // if the environment that created us is gone the owner can be null
+ // which means (assuming intermodule allocator) that the variable is still alive
+ // but can't be found as it's not part of any environment.
+ if (m_environmentOwner)
+ {
+ m_environmentOwner->RemoveVariable(m_guid);
+ m_environmentOwner = nullptr;
+ }
+ if (m_isConstructed)
+ {
+ destruct(this, DestroyTarget::Member); // destruct the value
+ }
+ }
+ // m_mutex is no longer held here, envLockHolder has released it above.
+ if (releaseByUseCount)
+ {
+ // m_mutex is unlocked before this is deleted
+ Environment::AllocatorInterface* allocator = m_allocator;
+ // Call child class dtor and clear the memory
+ destruct(this, DestroyTarget::Self);
+ allocator->DeAllocate(this);
+ }
+ }
+
// instance of the environment
EnvironmentInterface* EnvironmentInterface::s_environment = nullptr;
@@ -110,7 +147,7 @@ namespace AZ
#ifdef AZ_ENVIRONMENT_VALIDATE_ON_EXIT
AZ_Assert(m_numAttached == 0, "We should not delete an environment while there are %d modules attached! Unload all DLLs first!", m_numAttached);
#endif
-
+
for (auto variableIt : m_variableMap)
{
EnvironmentVariableHolderBase* holder = reinterpret_cast(variableIt.second);
diff --git a/Code/Framework/AzCore/AzCore/Module/Environment.h b/Code/Framework/AzCore/AzCore/Module/Environment.h
index b0711b1bbe..e87ff81446 100644
--- a/Code/Framework/AzCore/AzCore/Module/Environment.h
+++ b/Code/Framework/AzCore/AzCore/Module/Environment.h
@@ -200,6 +200,11 @@ namespace AZ
class EnvironmentVariableHolderBase
{
friend class EnvironmentImpl;
+ protected:
+ enum class DestroyTarget {
+ Member,
+ Self
+ };
public:
EnvironmentVariableHolderBase(u32 guid, AZ::Internal::EnvironmentInterface* environmentOwner, bool canOwnershipTransfer, Environment::AllocatorInterface* allocator)
: m_environmentOwner(environmentOwner)
@@ -217,12 +222,21 @@ namespace AZ
return m_isConstructed;
}
+ bool IsOwner() const
+ {
+ return m_moduleOwner == Environment::GetModuleId();
+ }
+
u32 GetId() const
{
return m_guid;
}
-
protected:
+ using DestructFunc = void (*)(EnvironmentVariableHolderBase *, DestroyTarget);
+ // Assumes the m_mutex is already locked.
+ // On return m_mutex is in an unlocked state.
+ void UnregisterAndDestroy(DestructFunc destruct, bool moduleRelease);
+
AZ::Internal::EnvironmentInterface* m_environmentOwner; ///< Used to know which environment we should use to free the variable if we can't transfer ownership
void* m_moduleOwner; ///< Used when the variable can't transfered across module and we need to destruct the variable when the module is going away
bool m_canTransferOwnership; ///< True if variable can be allocated in one module and freed in other. Usually true for POD types when they share allocator.
@@ -242,41 +256,29 @@ namespace AZ
memset(&m_value, 0, sizeof(T));
}
- template
+ template
void ConstructImpl(const AZStd::false_type& /* AZStd::has_trivial_constructor */, Args&&... args)
{
// Construction of non-trivial types is left up to the type's constructor.
new(&m_value) T(AZStd::forward(args)...);
}
-
- void DestructImpl(const AZStd::true_type& /* AZStd::is_trivially_destructible */)
+ static void DestructDispatchNoLock(EnvironmentVariableHolderBase *base, DestroyTarget selfDestruct)
{
- // do nothing
- }
-
- void DestructImpl(const AZStd::false_type& /* AZStd::is_trivially_destructible */)
- {
- reinterpret_cast(&m_value)->~T();
- }
-
- // Assumes the lock is already held
- void UnregisterAndDestruct()
- {
- // if the environment that created us is gone the owner can be null
- // which means (assuming intermodule allocator) that the variable is still alive
- // but can't be found as it's not part of any environment.
- if (m_environmentOwner)
+ auto *self = reinterpret_cast(base);
+ if (selfDestruct == DestroyTarget::Self)
{
- m_environmentOwner->RemoveVariable(m_guid);
- m_environmentOwner = nullptr;
+ self->~EnvironmentVariableHolder();
+ return;
}
- if (m_isConstructed)
+ AZ_Assert(self->m_isConstructed, "Variable is not constructed. Please check your logic and guard if needed!");
+ self->m_isConstructed = false;
+ self->m_moduleOwner = nullptr;
+ if constexpr(!AZStd::is_trivially_destructible_v)
{
- DestructNoLock();
+ reinterpret_cast(&self->m_value)->~T();
}
}
-
public:
EnvironmentVariableHolder(u32 guid, bool isOwnershipTransfer, Environment::AllocatorInterface* allocator)
: EnvironmentVariableHolderBase(guid, Environment::GetInstance(), isOwnershipTransfer, allocator)
@@ -287,12 +289,6 @@ namespace AZ
{
AZ_Assert(!m_isConstructed, "To get the destructor we should have already destructed the variable!");
}
-
- bool IsOwner() const
- {
- return m_moduleOwner == Environment::GetModuleId();
- }
-
void AddRef()
{
AZStd::lock_guard lock(m_mutex);
@@ -303,30 +299,8 @@ namespace AZ
void Release()
{
m_mutex.lock();
-
- if (--s_moduleUseCount == 0)
- {
- if (!m_canTransferOwnership && m_moduleOwner == AZ::Environment::GetModuleId())
- {
- UnregisterAndDestruct();
- }
- }
-
- if (--m_useCount == 0)
- {
- UnregisterAndDestruct();
-
- // unlock before this is deleted
- m_mutex.unlock();
-
- Environment::AllocatorInterface* allocator = m_allocator;
- // Call dtor and clear the memory
- this->~EnvironmentVariableHolder();
- allocator->DeAllocate(this);
- return;
- }
-
- m_mutex.unlock();
+ const bool moduleRelease = (--s_moduleUseCount == 0);
+ UnregisterAndDestroy(DestructDispatchNoLock, moduleRelease);
}
void Construct()
@@ -352,18 +326,10 @@ namespace AZ
}
}
- void DestructNoLock()
- {
- AZ_Assert(m_isConstructed, "Variable is not constructed. Please check your logic and guard if needed!");
- m_isConstructed = false;
- m_moduleOwner = nullptr;
- DestructImpl(typename AZStd::is_trivially_destructible::type());
- }
-
void Destruct()
{
AZStd::lock_guard lock(m_mutex);
- DestructNoLock();
+ DestructDispatchNoLock(this, DestroyTarget::Member);
}
// variable storage
diff --git a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
index c6fe112c6f..1c472ef901 100644
--- a/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
+++ b/Code/Framework/AzCore/AzCore/Serialization/Json/ByteStreamSerializer.cpp
@@ -71,7 +71,7 @@ namespace AZ
if (context.ShouldKeepDefaults() || !defaultValue || (valAsByteStream != *static_cast(defaultValue)))
{
const auto base64ByteStream = AZ::StringFunc::Base64::Encode(valAsByteStream.data(), valAsByteStream.size());
- outputValue.SetString(base64ByteStream.c_str(), base64ByteStream.size(), context.GetJsonAllocator());
+ outputValue.SetString(base64ByteStream.c_str(), static_cast(base64ByteStream.size()), context.GetJsonAllocator());
return context.Report(Tasks::WriteValue, Outcomes::Success, "ByteStream successfully stored.");
}
diff --git a/Code/Framework/AzCore/AzCore/std/chrono/types.h b/Code/Framework/AzCore/AzCore/std/chrono/types.h
index c86c684426..19ef2c8469 100644
--- a/Code/Framework/AzCore/AzCore/std/chrono/types.h
+++ b/Code/Framework/AzCore/AzCore/std/chrono/types.h
@@ -211,7 +211,7 @@ namespace AZStd
// 20.9.3.2, observer:
constexpr rep count() const { return m_rep; }
// 20.9.3.3, arithmetic:
- constexpr duration operator+() const { *this; }
+ constexpr duration operator+() const { return *this; }
constexpr duration operator-() const { return duration(-m_rep); }
constexpr duration& operator++() { ++m_rep; return *this; }
constexpr duration operator++(int) { return duration(m_rep++); }
diff --git a/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h b/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h
index 746af8974e..31fbdd85e9 100644
--- a/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h
+++ b/Code/Framework/AzCore/AzCore/std/containers/ring_buffer.h
@@ -1056,7 +1056,7 @@ namespace AZStd
inline void insert(const iterator& pos, ForwardIterator first, ForwardIterator last, const AZStd::forward_iterator_tag&)
{
size_type size = AZStd::distance(first, last);
- AZSTD_CONTAINER_ASSERT(size >= 0, "AZStd::ring_buffer::insert - there are no elements to insert!");
+ AZSTD_CONTAINER_ASSERT(first > last, "AZStd::ring_buffer::insert - there are no elements to insert!");
if (size == 0)
{
return;
diff --git a/Code/Framework/AzCore/AzCore/std/utils.h b/Code/Framework/AzCore/AzCore/std/utils.h
index 2d098af55e..0de56cedcb 100644
--- a/Code/Framework/AzCore/AzCore/std/utils.h
+++ b/Code/Framework/AzCore/AzCore/std/utils.h
@@ -294,7 +294,7 @@ namespace AZStd
T& m_v;
constexpr addr_impl_ref(T& v)
: m_v(v) {}
- constexpr addr_impl_ref& operator=(const addr_impl_ref& v) { m_v = v; }
+ constexpr addr_impl_ref& operator=(const addr_impl_ref& v) { m_v = v; return *this; }
constexpr operator T& () const { return m_v; }
};
diff --git a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
index 14ce16163a..f9411a1f8d 100644
--- a/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponentHelper.cpp
@@ -163,7 +163,11 @@ namespace AzFramework
AZ_TracePrintfOnce("AssetSystemComponent", "Failed to find asset platform, setting 'pc'\n");
outputConnectionSettings.m_assetPlatform = "pc";
}
- outputConnectionSettings.m_assetPlatform = assetsPlatform;
+ else
+ {
+ outputConnectionSettings.m_assetPlatform = assetsPlatform;
+ }
+
if (outputConnectionSettings.m_assetPlatform.empty())
{
assetsPlatform = AzFramework::OSPlatformToDefaultAssetPlatform(AZ_TRAIT_OS_PLATFORM_CODENAME);
diff --git a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
index 87353c5807..617eb3a0b9 100644
--- a/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
+++ b/Code/Framework/AzFramework/AzFramework/Spawnable/SpawnableEntitiesInterface.cpp
@@ -227,8 +227,10 @@ namespace AzFramework
EntitySpawnTicket::EntitySpawnTicket(EntitySpawnTicket&& rhs)
: m_payload(rhs.m_payload)
+ , m_id(rhs.m_id)
{
rhs.m_payload = nullptr;
+ rhs.m_id = 0;
}
EntitySpawnTicket::EntitySpawnTicket(AZ::Data::Asset spawnable)
diff --git a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp
index 51c256a9b3..8deed820d3 100644
--- a/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp
+++ b/Code/Framework/AzFramework/Platform/Linux/AzFramework/Process/ProcessWatcher_Linux.cpp
@@ -269,7 +269,7 @@ namespace AzFramework
int numEnvironmentVars = 0;
if (processLaunchInfo.m_environmentVariables)
{
- const int numEnvironmentVars = processLaunchInfo.m_environmentVariables->size();
+ numEnvironmentVars = processLaunchInfo.m_environmentVariables->size();
// Adding one more as exec expects the array to have a nullptr as the last element
environmentVariables = new char*[numEnvironmentVars + 1];
for (int i = 0; i < numEnvironmentVars; i++)
diff --git a/Code/Framework/AzFramework/Tests/OctreeTests.cpp b/Code/Framework/AzFramework/Tests/OctreeTests.cpp
index 3faf98adfb..f248dbfa66 100644
--- a/Code/Framework/AzFramework/Tests/OctreeTests.cpp
+++ b/Code/Framework/AzFramework/Tests/OctreeTests.cpp
@@ -98,7 +98,7 @@ namespace UnitTest
// If an entry is removed from the octree as an unintended side effect of updating an existing entry,
// GetEntryCount can't be relied upon to report the actual entry count.
// So manually count the entries when using the entry count for validation.
- uint32_t manualEntryCount = 0;
+ size_t manualEntryCount = 0;
visScene->EnumerateNoCull([&manualEntryCount](const AzFramework::IVisibilityScene::NodeData& nodeData) { manualEntryCount += nodeData.m_entries.size(); });
EXPECT_EQ(manualEntryCount, expectedEntryCount);
@@ -409,7 +409,7 @@ namespace UnitTest
}
// Expect all the entries to be in the scene
- ValidateEntryCountEqualsExpectedCount(m_octreeScene, visEntries.size());
+ ValidateEntryCountEqualsExpectedCount(m_octreeScene, static_cast(visEntries.size()));
// Update them, without making any actual changes
for (AzFramework::VisibilityEntry& entry : visEntries)
@@ -418,6 +418,6 @@ namespace UnitTest
}
// Expect all the entries to be in the scene
- ValidateEntryCountEqualsExpectedCount(m_octreeScene, visEntries.size());
+ ValidateEntryCountEqualsExpectedCount(m_octreeScene, static_cast(visEntries.size()));
}
}
diff --git a/Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp b/Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
index 7eff4b5eeb..f68af08f4a 100644
--- a/Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
+++ b/Code/Framework/AzFramework/Tests/Spawnable/SpawnableEntitiesManagerTests.cpp
@@ -366,6 +366,24 @@ namespace UnitTest
}
}
+ TEST_F(SpawnableEntitiesManagerTest, EntitySpawnTicket_Move_Works)
+ {
+ AzFramework::EntitySpawnTicket ticket1(*m_spawnableAsset);
+ AzFramework::EntitySpawnTicket ticket2(*m_spawnableAsset);
+
+ const AzFramework::EntitySpawnTicket::Id ticket1Id = ticket1.GetId();
+ const AzFramework::EntitySpawnTicket::Id ticket2Id = ticket2.GetId();
+
+ AzFramework::EntitySpawnTicket ticketMoveConstructor(AZStd::move(ticket1));
+ EXPECT_TRUE(ticketMoveConstructor.IsValid());
+ EXPECT_EQ(ticketMoveConstructor.GetId(), ticket1Id);
+
+ AzFramework::EntitySpawnTicket ticketMoveOperator;
+ ticketMoveOperator = AZStd::move(ticket2);
+ EXPECT_TRUE(ticketMoveOperator.IsValid());
+ EXPECT_EQ(ticketMoveOperator.GetId(), ticket2Id);
+ }
+
TEST_F(SpawnableEntitiesManagerTest, SpawnAllEntities_DeleteTicketBeforeCall_NoCrash)
{
{
diff --git a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp
index 1beb83e19f..6d7358a425 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpConnection.cpp
@@ -170,7 +170,7 @@ namespace AzNetworking
}
timeoutItem->UpdateTimeoutTime(startTimeMs);
- NetworkOutputSerializer serializer(buffer.GetBuffer(), buffer.GetSize());
+ NetworkOutputSerializer serializer(buffer.GetBuffer(), static_cast(buffer.GetSize()));
if (m_state == ConnectionState::Connecting)
{
const ConnectResult connectResult = m_networkInterface.GetConnectionListener().ValidateConnect(GetRemoteAddress(), header, serializer);
@@ -198,7 +198,7 @@ namespace AzNetworking
{
TcpPacketEncodingBuffer buffer;
{
- NetworkInputSerializer serializer(buffer.GetBuffer(), buffer.GetCapacity());
+ NetworkInputSerializer serializer(buffer.GetBuffer(), static_cast(buffer.GetCapacity()));
if (!const_cast(packet).Serialize(serializer))
{
AZ_Assert(false, "SendReliablePacket: Unable to serialize packet [Type: %d]", packet.GetPacketType());
@@ -272,7 +272,7 @@ namespace AzNetworking
{
TcpPacketHeader header(packetType, aznumeric_cast(payloadBuffer.GetSize()));
header.SetPacketFlag(PacketFlag::Compressed, shouldCompress);
- NetworkInputSerializer serializer(headerBuffer.GetBuffer(), headerBuffer.GetCapacity());
+ NetworkInputSerializer serializer(headerBuffer.GetBuffer(), static_cast(headerBuffer.GetCapacity()));
if (!header.Serialize(serializer))
{
return false;
@@ -313,7 +313,7 @@ namespace AzNetworking
m_networkInterface.GetMetrics().m_sendBytesCompressedDelta += (payloadSize - compressionMemBytesUsed);
writeBuffer.Resize(aznumeric_cast(compressionMemBytesUsed));
- payloadSize = writeBuffer.GetSize();
+ payloadSize = static_cast(writeBuffer.GetSize());
srcData = writeBuffer.GetBuffer();
}
diff --git a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl
index 322a4e6abf..9c4b2f1a17 100644
--- a/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl
+++ b/Code/Framework/AzNetworking/AzNetworking/TcpTransport/TcpRingBuffer.inl
@@ -12,7 +12,7 @@ namespace AzNetworking
{
template
inline TcpRingBuffer::TcpRingBuffer()
- : m_impl(m_buffer.data(), m_buffer.size())
+ : m_impl(m_buffer.data(), static_cast(m_buffer.size()))
{
;
}
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp
index 37c952cf30..bd5e62983f 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/DtlsEndpoint.cpp
@@ -84,7 +84,7 @@ namespace AzNetworking
if (dtlsData.GetSize() > 0)
{
const uint8_t* encryptedData = dtlsData.GetBuffer();
- const uint32_t encryptedSize = dtlsData.GetSize();
+ const uint32_t encryptedSize = static_cast(dtlsData.GetSize());
BIO_write(m_readBio, encryptedData, encryptedSize);
}
DtlsEndpoint::HandshakeState prevState = m_state;
@@ -196,7 +196,7 @@ namespace AzNetworking
// Need to do this... connection negotiation may have left data in the write bio that we need to send out
if (BIO_ctrl_pending(m_writeBio) > 0)
{
- const uint32_t maxBufferSize = outHandshakeData.GetCapacity();
+ const uint32_t maxBufferSize = static_cast(outHandshakeData.GetCapacity());
outHandshakeData.Resize(maxBufferSize);
const int32_t dataSize = BIO_read(m_writeBio, outHandshakeData.GetBuffer(), maxBufferSize);
outHandshakeData.Resize(dataSize);
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp
index 831c35552c..66fe6f30eb 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpFragmentQueue.cpp
@@ -108,7 +108,7 @@ namespace AzNetworking
return true;
}
- totalPacketSize += packetFragments[index]->GetChunkBuffer().GetSize();
+ totalPacketSize += static_cast(packetFragments[index]->GetChunkBuffer().GetSize());
}
// We now mark this sequence as delivered, so if by some chance all the individual chunks get redelivered again we don't double deliver the reconstructed packet
@@ -125,7 +125,7 @@ namespace AzNetworking
uint8_t* bufferPointer = buffer.GetBuffer();
for (uint32_t index = 0; index < packetFragments.size(); ++index)
{
- const uint32_t chunkSize = packetFragments[index]->GetChunkBuffer().GetSize();
+ const uint32_t chunkSize = static_cast(packetFragments[index]->GetChunkBuffer().GetSize());
memcpy(bufferPointer, packetFragments[index]->GetChunkBuffer().GetBuffer(), chunkSize);
bufferPointer += chunkSize;
}
@@ -133,7 +133,7 @@ namespace AzNetworking
// We can erase all the chunks now, packet is completed
m_packetFragments.erase(fragmentSequence);
- NetworkOutputSerializer networkSerializer(buffer.GetBuffer(), buffer.GetSize());
+ NetworkOutputSerializer networkSerializer(buffer.GetBuffer(), static_cast(buffer.GetSize()));
{
ISerializer& networkISerializer = networkSerializer; // To get the default typeinfo parameters in ISerializer
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
index 48b3ad57e1..d50b20831f 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpNetworkInterface.cpp
@@ -249,7 +249,7 @@ namespace AzNetworking
continue;
}
decodedPacketData = m_decompressBuffer.GetBuffer();
- decodedPacketSize = m_decompressBuffer.GetSize();
+ decodedPacketSize = static_cast(m_decompressBuffer.GetSize());
}
GetMetrics().m_recvBytesUncompressed += decodedPacketSize;
@@ -504,7 +504,7 @@ namespace AzNetworking
{
buffer.Resize(buffer.GetCapacity());
- NetworkInputSerializer networkSerializer(buffer.GetBuffer(), buffer.GetCapacity());
+ NetworkInputSerializer networkSerializer(buffer.GetBuffer(), static_cast(buffer.GetCapacity()));
ISerializer& serializer = networkSerializer; // To get the default typeinfo parameters in ISerializer
if (!header.SerializePacketFlags(serializer))
@@ -527,7 +527,7 @@ namespace AzNetworking
buffer.Resize(serializer.GetSize());
}
- uint32_t packetSize = buffer.GetSize();
+ uint32_t packetSize = static_cast(buffer.GetSize());
uint8_t* packetData = buffer.GetBuffer();
// If the packet doesn't fit within our MTU (minus potential SSL encryption overhead), break it up
@@ -559,7 +559,7 @@ namespace AzNetworking
UdpPacketEncodingBuffer writeBuffer;
if (m_compressor && shouldCompress)
{
- NetworkInputSerializer flagSerializer(writeBuffer.GetBuffer(), writeBuffer.GetCapacity());
+ NetworkInputSerializer flagSerializer(writeBuffer.GetBuffer(), static_cast(writeBuffer.GetCapacity()));
ISerializer& serializer = flagSerializer; // To get the default typeinfo parameters in ISerializer
header.SetPacketFlag(PacketFlag::Compressed, true);
@@ -572,7 +572,7 @@ namespace AzNetworking
AZ_Assert(flagSize == 1, "Flag bitfield should serialize to one byte");
// Compress the packet, make sure to offset by the size of the flag which is now serialized
- const uint32_t payloadSize = buffer.GetSize() - flagSize;
+ const uint32_t payloadSize = static_cast(buffer.GetSize() - flagSize);
uint8_t* payload = buffer.GetBuffer() + flagSize;
const AZStd::size_t maxSizeNeeded = m_compressor->GetMaxCompressedBufferSize(payloadSize);
AZStd::size_t compressionMemBytesUsed = 0;
@@ -588,7 +588,7 @@ namespace AzNetworking
if (compressionMemBytesUsed < payloadSize)
{
writeBuffer.Resize(aznumeric_cast(flagSize + compressionMemBytesUsed));
- packetSize = writeBuffer.GetSize();
+ packetSize = static_cast(writeBuffer.GetSize());
packetData = writeBuffer.GetBuffer();
// Track byte delta caused by compression
GetMetrics().m_sendBytesCompressedDelta += (packetSize - compressionMemBytesUsed);
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp
index 8b535e01aa..b1474bc10f 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpReaderThread.cpp
@@ -177,7 +177,7 @@ namespace AzNetworking
}
IpAddress address;
- const uint32_t bufferHead = receiveBuffer.GetSize();
+ const uint32_t bufferHead = static_cast(receiveBuffer.GetSize());
if (bufferHead + MaxUdpTransmissionUnit >= receiveBuffer.GetCapacity())
{
AZLOG_INFO("Receive buffer full, leaving data on the socket. Size exceeded by %d",
diff --git a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
index 29a99f96a1..997fc323a9 100644
--- a/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
+++ b/Code/Framework/AzNetworking/AzNetworking/UdpTransport/UdpSocket.cpp
@@ -241,7 +241,7 @@ namespace AzNetworking
#ifdef ENABLE_LATENCY_DEBUG
int32_t UdpSocket::SendInternalDeferred(const DeferredData& data) const
{
- return SendInternal(data.m_address, data.m_dataBuffer.GetBuffer(), data.m_dataBuffer.GetSize(), data.m_encrypt, *data.m_dtlsEndpoint);
+ return SendInternal(data.m_address, data.m_dataBuffer.GetBuffer(), static_cast(data.m_dataBuffer.GetSize()), data.m_encrypt, *data.m_dtlsEndpoint);
}
#endif
}
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
index e95b306d43..e7fa543faf 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Application/ToolsApplication.h
@@ -98,7 +98,7 @@ namespace AzToolsFramework
SourceControlFileInfo GetSceneSourceControlInfo() override;
bool AreAnyEntitiesSelected() override { return !m_selectedEntities.empty(); }
- int GetSelectedEntitiesCount() override { return m_selectedEntities.size(); }
+ int GetSelectedEntitiesCount() override { return static_cast(m_selectedEntities.size()); }
const EntityIdList& GetSelectedEntities() override { return m_selectedEntities; }
const EntityIdList& GetHighlightedEntities() override { return m_highlightedEntities; }
void SetSelectedEntities(const EntityIdList& selectedEntities) override;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
index 69ee4e6188..92c8d37540 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetUtils.cpp
@@ -34,8 +34,6 @@ namespace AzToolsFramework::AssetUtils::Internal
return {};
}
- const int pathLen = sourceFolder.length() + 1;
-
AZ::IO::Path sourceWildcard{ sourceFolder };
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
index 2d97689610..b5cf5fb878 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Entity/PrefabEditorEntityOwnershipService.cpp
@@ -72,15 +72,8 @@ namespace AzToolsFramework
if (m_rootInstance != nullptr)
{
- // Need to save off the template id to remove the template after the instance is deleted.
- Prefab::TemplateId templateId = m_rootInstance->GetTemplateId();
m_rootInstance.reset();
- if (templateId != Prefab::InvalidTemplateId)
- {
- // Remove the template here so that if we're in a Deactivate/Activate cycle, it can recreate the template/rootInstance
- // correctly
- m_prefabSystemComponent->RemoveTemplate(templateId);
- }
+ m_prefabSystemComponent->RemoveAllTemplates();
}
}
@@ -95,7 +88,7 @@ namespace AzToolsFramework
if (templateId != Prefab::InvalidTemplateId)
{
m_rootInstance->SetTemplateId(Prefab::InvalidTemplateId);
- m_prefabSystemComponent->RemoveTemplate(templateId);
+ m_prefabSystemComponent->RemoveAllTemplates();
}
m_rootInstance->SetContainerEntityName("Level");
}
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
index 8f93ebb6df..814c4e2a7f 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceToTemplatePropagator.cpp
@@ -164,7 +164,7 @@ namespace AzToolsFramework
AZStd::string path = prefix + pathIter->value.GetString();
- pathIter->value.SetString(path.c_str(), path.length(), providedPatch.GetAllocator());
+ pathIter->value.SetString(path.c_str(), static_cast(path.length()), providedPatch.GetAllocator());
}
}
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
index 1c389f6b97..9ef74167a6 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/Instance/InstanceUpdateExecutor.cpp
@@ -97,7 +97,7 @@ namespace AzToolsFramework
m_updatingTemplateInstancesInQueue = true;
const int instanceCountToUpdateInBatch =
- m_instanceCountToUpdateInBatch == 0 ? m_instancesUpdateQueue.size() : m_instanceCountToUpdateInBatch;
+ m_instanceCountToUpdateInBatch == 0 ? static_cast(m_instancesUpdateQueue.size()) : m_instanceCountToUpdateInBatch;
TemplateId currentTemplateId = InvalidTemplateId;
TemplateReference currentTemplateReference = AZStd::nullopt;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
index a03e48062c..69efe33d72 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp
@@ -1458,7 +1458,7 @@ namespace AzToolsFramework
if (&owningInstance->get() == &commonRootEntityOwningInstance)
{
// If it's the same instance, we can add this entity to the new instance entities.
- int priorEntitiesSize = entities.size();
+ size_t priorEntitiesSize = entities.size();
entities.insert(entity);
@@ -1645,7 +1645,7 @@ namespace AzToolsFramework
entityDomAfter.Parse(newEntityDomString.toUtf8().constData());
// Add the new Entity DOM to the Entities member of the instance
- rapidjson::Value aliasName(newEntityAlias.c_str(), newEntityAlias.length(), domToAddDuplicatedEntitiesUnder.GetAllocator());
+ rapidjson::Value aliasName(newEntityAlias.c_str(), static_cast(newEntityAlias.length()), domToAddDuplicatedEntitiesUnder.GetAllocator());
entitiesIter->value.AddMember(AZStd::move(aliasName), entityDomAfter, domToAddDuplicatedEntitiesUnder.GetAllocator());
}
@@ -1717,7 +1717,7 @@ namespace AzToolsFramework
nestedInstanceDomAfter.Parse(newInstanceDomString.toUtf8().constData());
// Add the new Instance DOM to the Instances member of the instance
- rapidjson::Value aliasName(newInstanceAlias.c_str(), newInstanceAlias.length(), domToAddDuplicatedInstancesUnder.GetAllocator());
+ rapidjson::Value aliasName(newInstanceAlias.c_str(), static_cast(newInstanceAlias.length()), domToAddDuplicatedInstancesUnder.GetAllocator());
instancesIter->value.AddMember(AZStd::move(aliasName), nestedInstanceDomAfter, domToAddDuplicatedInstancesUnder.GetAllocator());
}
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp
index 0a2fbb14f6..ea13d368cd 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/PythonTerminal/ScriptHelpDialog.cpp
@@ -251,7 +251,7 @@ namespace AzToolsFramework
{
EditorPythonConsoleInterface::GlobalFunctionCollection globalFunctionCollection;
editorPythonConsoleInterface->GetGlobalFunctionList(globalFunctionCollection);
- m_items.reserve(globalFunctionCollection.size());
+ m_items.reserve(static_cast(globalFunctionCollection.size()));
for (const EditorPythonConsoleInterface::GlobalFunction& globalFunction : globalFunctionCollection)
{
Item item;
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
index 30b3f8915b..4115fe409e 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/Outliner/EntityOutlinerListModel.cpp
@@ -247,7 +247,7 @@ namespace AzToolsFramework
if (highlightTextIndex >= 0)
{
const QString BACKGROUND_COLOR{ "#707070" };
- label.insert(highlightTextIndex + m_filterString.length(), "");
+ label.insert(highlightTextIndex + static_cast(m_filterString.length()), "");
label.insert(highlightTextIndex, "");
}
} while(highlightTextIndex > 0);
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
index 17155076ec..f166e85ff9 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/EntityPropertyEditor.cpp
@@ -2643,22 +2643,22 @@ namespace AzToolsFramework
m_gui->m_statusComboBox->setItalic(false);
if (allActive)
{
- m_gui->m_statusComboBox->setHeaderOverride(m_itemNames[StatusTypeToIndex(StatusType::StatusStartActive)]);
- m_gui->m_statusComboBox->setCurrentIndex(StatusTypeToIndex(StatusType::StatusStartActive));
+ m_gui->m_statusComboBox->setHeaderOverride(m_itemNames[static_cast(StatusTypeToIndex(StatusType::StatusStartActive))]);
+ m_gui->m_statusComboBox->setCurrentIndex(static_cast(StatusTypeToIndex(StatusType::StatusStartActive)));
m_comboItems[StatusTypeToIndex(StatusType::StatusStartActive)]->setCheckState(Qt::Checked);
}
else
if (allInactive)
{
- m_gui->m_statusComboBox->setHeaderOverride(m_itemNames[StatusTypeToIndex(StatusType::StatusStartInactive)]);
- m_gui->m_statusComboBox->setCurrentIndex(StatusTypeToIndex(StatusType::StatusStartInactive));
+ m_gui->m_statusComboBox->setHeaderOverride(m_itemNames[static_cast(StatusTypeToIndex(StatusType::StatusStartInactive))]);
+ m_gui->m_statusComboBox->setCurrentIndex(static_cast(StatusTypeToIndex(StatusType::StatusStartInactive)));
m_comboItems[StatusTypeToIndex(StatusType::StatusStartInactive)]->setCheckState(Qt::Checked);
}
else
if (allEditorOnly)
{
- m_gui->m_statusComboBox->setHeaderOverride(m_itemNames[StatusTypeToIndex(StatusType::StatusEditorOnly)]);
- m_gui->m_statusComboBox->setCurrentIndex(StatusTypeToIndex(StatusType::StatusEditorOnly));
+ m_gui->m_statusComboBox->setHeaderOverride(m_itemNames[static_cast(StatusTypeToIndex(StatusType::StatusEditorOnly))]);
+ m_gui->m_statusComboBox->setCurrentIndex(static_cast(StatusTypeToIndex(StatusType::StatusEditorOnly)));
m_comboItems[StatusTypeToIndex(StatusType::StatusEditorOnly)]->setCheckState(Qt::Checked);
}
else // Some marked active, some not
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
index 3af1672ecb..696cf6b184 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportSelection/EditorInteractionSystemComponent.cpp
@@ -50,11 +50,19 @@ namespace AzToolsFramework
AzFramework::ViewportDebugDisplayEventBus::Handler::BusConnect(GetEntityContextId());
}
- m_entityDataCache = AZStd::make_unique();
+ // temporarily disconnect from EditorInteractionSystemViewportSelectionRequestBus in case during the creation of
+ // m_interactionRequests (see interactionRequestsBuilder below) an event is propagated to the handler, if this happens then
+ // m_interactionRequests will be null as it will not have finished being created yet so we ensure no events are forwarded to it
+ EditorInteractionSystemViewportSelectionRequestBus::Handler::BusDisconnect();
- m_interactionRequests.reset(); // BusConnect/Disconnect in constructor/destructor,
- // so have to reset before assigning the new one
- m_interactionRequests = interactionRequestsBuilder(m_entityDataCache.get());
+ {
+ m_entityDataCache = AZStd::make_unique();
+ m_interactionRequests.reset(); // BusConnect/Disconnect in constructor/destructor,
+ // so have to reset before assigning the new one
+ m_interactionRequests = interactionRequestsBuilder(m_entityDataCache.get());
+ }
+
+ EditorInteractionSystemViewportSelectionRequestBus::Handler::BusConnect(GetEntityContextId());
}
void EditorInteractionSystemComponent::SetDefaultHandler()
diff --git a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
index 3b2c26114d..80cc7941b0 100644
--- a/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
+++ b/Code/Framework/AzToolsFramework/AzToolsFramework/ViewportUi/ViewportUiDisplay.cpp
@@ -380,7 +380,6 @@ namespace AzToolsFramework::ViewportUi::Internal
}
PrepareWidgetForViewportUi(widget);
- m_renderOverlay->setFocus();
}
void ViewportUiDisplay::SetUiOverlayContentsAnchored(QPointer widget, const Qt::Alignment alignment)
@@ -392,7 +391,6 @@ namespace AzToolsFramework::ViewportUi::Internal
PrepareWidgetForViewportUi(widget);
m_uiOverlayLayout.AddAnchoredWidget(widget, alignment);
- m_renderOverlay->setFocus();
}
void ViewportUiDisplay::UpdateUiOverlayGeometry()
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
index 51a044e9c1..7e47fa9569 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/Benchmark/PrefabBenchmarkFixture.cpp
@@ -110,8 +110,8 @@ namespace Benchmark
void BM_Prefab::SetUpMockValidatorForReadPrefab()
{
- int pathCount = m_paths.size();
- for (int number = 0; number < pathCount; ++number)
+ const size_t pathCount = m_paths.size();
+ for (size_t number = 0; number < pathCount; ++number)
{
m_mockIOActionValidator->ReadPrefabDom(
m_paths[number], UnitTest::PrefabTestDomUtils::CreatePrefabDom());
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
index e3b65db97e..8379992553 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabInstanceToTemplatePropagatorTests.cpp
@@ -245,7 +245,9 @@ namespace UnitTest
m_instanceToTemplateInterface->GenerateDomForInstance(instanceDomBeforeUpdate, *firstInstance);
//remove instance from instance
- firstInstance->DetachNestedInstance(addedAlias);
+ AZStd::unique_ptr detachedInstance = firstInstance->DetachNestedInstance(addedAlias);
+ ASSERT_TRUE(detachedInstance != nullptr);
+ m_prefabSystemComponent->RemoveLink(detachedInstance->GetLinkId());
//create document with after change snapshot
PrefabDom instanceDomAfterUpdate;
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h
index 66ad2fbe44..f90a91ea3c 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabTestDomUtils.h
@@ -38,7 +38,7 @@ namespace UnitTest
const EntityAlias& entityAlias)
{
return GetPrefabDomEntitiesPath()
- .Append(entityAlias.c_str(), entityAlias.length());
+ .Append(entityAlias.c_str(), static_cast(entityAlias.length()));
};
inline PrefabDomPath GetPrefabDomEntityNamePath(
@@ -62,7 +62,7 @@ namespace UnitTest
inline PrefabDomPath GetPrefabDomInstancePath(
const InstanceAlias& instanceAlias)
{
- return GetPrefabDomInstancesPath().Append(instanceAlias.c_str(), instanceAlias.length());
+ return GetPrefabDomInstancesPath().Append(instanceAlias.c_str(), static_cast(instanceAlias.length()));
};
inline PrefabDomPath GetPrefabDomInstancePath(
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp
index 0d955789ac..baded6d43e 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateInstancesTests.cpp
@@ -309,6 +309,7 @@ namespace UnitTest
// and use the updated enclosing Instance to update the PrefabDom of Template.
AZStd::unique_ptr detachedInstance = newEnclosingInstance->DetachNestedInstance(nestedInstanceAliases.front());
ASSERT_TRUE(detachedInstance);
+ m_prefabSystemComponent->RemoveLink(detachedInstance->GetLinkId());
PrefabDom updatedTemplateDom;
ASSERT_TRUE(PrefabDomUtils::StoreInstanceInPrefabDom(*newEnclosingInstance, updatedTemplateDom));
diff --git a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp
index 4e7d9d95d1..6f90e245f7 100644
--- a/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp
+++ b/Code/Framework/AzToolsFramework/Tests/Prefab/PrefabUpdateTemplateTests.cpp
@@ -274,6 +274,7 @@ namespace UnitTest
InstanceAlias aliasOfWheelInstanceToRetain = wheelInstanceAliasesUnderAxle.front();
AZStd::unique_ptr detachedInstance = axleInstance->DetachNestedInstance(wheelInstanceAliasesUnderAxle.back());
ASSERT_TRUE(detachedInstance);
+ m_prefabSystemComponent->RemoveLink(detachedInstance->GetLinkId());
PrefabDom updatedAxleInstanceDom;
ASSERT_TRUE(PrefabDomUtils::StoreInstanceInPrefabDom(*axleInstance, updatedAxleInstanceDom));
m_prefabSystemComponent->UpdatePrefabTemplate(axleTemplateId, updatedAxleInstanceDom);
diff --git a/Code/Legacy/CryCommon/CryArray.h b/Code/Legacy/CryCommon/CryArray.h
index 167f1cfb57..b304df28af 100644
--- a/Code/Legacy/CryCommon/CryArray.h
+++ b/Code/Legacy/CryCommon/CryArray.h
@@ -11,7 +11,7 @@
#define CRYINCLUDE_CRYCOMMON_CRYARRAY_H
#pragma once
-#include "CryLegacyAllocator.h"
+#include
//---------------------------------------------------------------------------
// Convenient iteration macros
@@ -675,7 +675,7 @@ namespace NArray
I capacity() const
{
- I aligned_bytes = Align(size() * sizeof(T), sizeof(I));
+ I aligned_bytes = static_cast(Align(size() * sizeof(T), sizeof(I)));
if (m_nSizeCap & nCAP_BIT)
{
// Capacity stored in word following data
@@ -693,7 +693,7 @@ namespace NArray
// Store size, and assert against overflow.
assert(s <= c);
m_nSizeCap = s;
- I aligned_bytes = Align(s * sizeof(T), sizeof(I));
+ I aligned_bytes = static_cast(Align(s * sizeof(T), sizeof(I)));
if (c * sizeof(T) >= aligned_bytes + sizeof(I))
{
// Has extra capacity, more than word-alignment
diff --git a/Code/Legacy/CryCommon/CryLegacyAllocator.h b/Code/Legacy/CryCommon/CryLegacyAllocator.h
index 81e3f90026..b0e1e29657 100644
--- a/Code/Legacy/CryCommon/CryLegacyAllocator.h
+++ b/Code/Legacy/CryCommon/CryLegacyAllocator.h
@@ -10,8 +10,6 @@
#include "LegacyAllocator.h"
-#include
-
//-----------------------------------------------------------------------------
// CryModule allocation API
//-----------------------------------------------------------------------------
@@ -95,128 +93,3 @@ inline void* CryModuleReallocAlignImpl(void* prev, size_t size, size_t alignment
return ptr;
}
-
-//-----------------------------------------------------------------------------
-// CryCrt alloc API
-//-----------------------------------------------------------------------------
-inline size_t CryCrtSize(void* p)
-{
- return AZ::AllocatorInstance::Get().AllocationSize(p);
-}
-
-inline void* CryCrtMalloc(size_t size)
-{
- return CryModuleMalloc(size);
-}
-
-inline size_t CryCrtFree(void* p)
-{
- size_t size = CryCrtSize(p);
- CryModuleFree(p);
- return size;
-};
-
-//-----------------------------------------------------------------------------
-// CrySystemCrt alloc API
-//-----------------------------------------------------------------------------
-inline size_t CrySystemCrtSize(void* p)
-{
- return AZ::AllocatorInstance::Get().AllocationSize(p);
-}
-
-inline void* CrySystemCrtMalloc(size_t size)
-{
- return AZ::AllocatorInstance::Get().Allocate(size, 0, 0, "AZ::LegacyAllocator");
-}
-
-inline void* CrySystemCrtRealloc(void* p, size_t size)
-{
- // Use LegacyAllocator's special ReAllocate
- return AZ::AllocatorInstance::Get().ReAllocate(p, size, 0);
-}
-
-inline size_t CrySystemCrtFree(void* p)
-{
- size_t size = CrySystemCrtSize(p);
- CryModuleFree(p);
- return size;
-}
-
-inline size_t CrySystemCrtGetUsedSpace()
-{
- return AZ::AllocatorInstance::Get().NumAllocatedBytes();
-}
-
-//-----------------------------------------------------------------------------
-// CryMalloc API
-//-----------------------------------------------------------------------------
-inline void* CryMalloc(size_t size, size_t& allocated, size_t alignment)
-{
- if (!size)
- {
- allocated = 0;
- return nullptr;
- }
-
- // The original implementation guaranteed 16 byte min alignment
- alignment = AZStd::GetMax(alignment, 16);
- void* ptr = AZ::AllocatorInstance::Get().Allocate(size, alignment, 0, "CryMalloc", __FILE__, __LINE__);
- allocated = AZ::AllocatorInstance::Get().AllocationSize(ptr);
- return ptr;
-}
-
-inline void* CryRealloc(void* memblock, size_t size, size_t& allocated, size_t& oldsize, size_t alignment)
-{
- oldsize = AZ::AllocatorInstance::Get().AllocationSize(memblock);
- void* ptr = AZ::AllocatorInstance::Get().ReAllocate(memblock, size, alignment);
- allocated = AZ::AllocatorInstance::Get().AllocationSize(ptr);
- return ptr;
-}
-
-inline size_t CryFree(void* p, size_t /*alignment*/)
-{
- size_t size = AZ::AllocatorInstance::Get().AllocationSize(p);
- AZ::AllocatorInstance::Get().DeAllocate(p, size);
- return size;
-}
-
-inline size_t CryGetMemSize(void* memblock, size_t /*sourceSize*/)
-{
- return AZ::AllocatorInstance::Get().AllocationSize(memblock);
-}
-
-inline int CryMemoryGetAllocatedSize()
-{
- return AZ::AllocatorInstance::Get().NumAllocatedBytes();
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline int CryMemoryGetPoolSize()
-{
- return 0;
-}
-
-//////////////////////////////////////////////////////////////////////////
-inline int CryStats([[maybe_unused]] char* buf)
-{
- return 0;
-}
-
-inline int CryGetUsedHeapSize()
-{
- return AZ::AllocatorInstance::Get().NumAllocatedBytes();
-}
-
-inline int CryGetWastedHeapSize()
-{
- return 0;
-}
-
-inline void CryCleanup()
-{
- AZ::AllocatorInstance::Get().GarbageCollect();
-}
-
-inline void CryResetStats(void)
-{
-}
diff --git a/Code/Legacy/CryCommon/CryName.h b/Code/Legacy/CryCommon/CryName.h
index 0495ad78f1..ce17d1f540 100644
--- a/Code/Legacy/CryCommon/CryName.h
+++ b/Code/Legacy/CryCommon/CryName.h
@@ -45,7 +45,7 @@ struct INameTable
const char* GetStr() { return (char*)(this + 1); }
void AddRef() { nRefCount++; /*InterlockedIncrement(&_header()->nRefCount);*/};
int Release() { return --nRefCount; };
- int GetMemoryUsage() { return sizeof(SNameEntry) + strlen(GetStr()); }
+ int GetMemoryUsage() { return static_cast(sizeof(SNameEntry) + strlen(GetStr())); }
int GetLength(){return nLength; }
};
@@ -102,14 +102,14 @@ public:
if (!pEntry)
{
// Create a new entry.
- unsigned int nLen = strlen(str);
- unsigned int allocLen = sizeof(SNameEntry) + (nLen + 1) * sizeof(char);
+ size_t nLen = strlen(str);
+ size_t allocLen = sizeof(SNameEntry) + (nLen + 1) * sizeof(char);
pEntry = (SNameEntry*)CryModuleMalloc(allocLen);
assert(pEntry != NULL);
pEntry->nTag = SNameEntry::TAG;
pEntry->nRefCount = 0;
- pEntry->nLength = nLen;
- pEntry->nAllocSize = allocLen;
+ pEntry->nLength = static_cast(nLen);
+ pEntry->nAllocSize = static_cast(allocLen);
// Copy string to the end of name entry.
char* pEntryStr = const_cast(pEntry->GetStr());
memcpy(pEntryStr, str, nLen + 1);
@@ -134,7 +134,7 @@ public:
int n = 0;
for (it = m_nameMap.begin(); it != m_nameMap.end(); it++)
{
- nSize += strlen(it->first);
+ nSize += static_cast(strlen(it->first));
nSize += it->second->GetMemoryUsage();
n++;
}
@@ -149,7 +149,7 @@ public:
}
virtual int GetNumberOfEntries()
{
- return m_nameMap.size();
+ return static_cast(m_nameMap.size());
}
// Log all names inside CryName table.
diff --git a/Code/Legacy/CryCommon/CryPodArray.h b/Code/Legacy/CryCommon/CryPodArray.h
index ee36750f7f..20693b29ac 100644
--- a/Code/Legacy/CryCommon/CryPodArray.h
+++ b/Code/Legacy/CryCommon/CryPodArray.h
@@ -159,8 +159,8 @@ public:
return numElements != m_elements.size();
}
- ILINE int Count() const { return m_elements.size(); }
- ILINE unsigned int Size() const { return m_elements.size(); }
+ ILINE size_t Count() const { return m_elements.size(); }
+ ILINE size_t Size() const { return m_elements.size(); }
ILINE int IsEmpty() const { return m_elements.empty(); }
diff --git a/Code/Legacy/CryCommon/CryString.h b/Code/Legacy/CryCommon/CryString.h
index 72469e3dca..459e25b63c 100644
--- a/Code/Legacy/CryCommon/CryString.h
+++ b/Code/Legacy/CryCommon/CryString.h
@@ -1266,7 +1266,7 @@ inline void CryStringT::resize(size_type nCount, value_type _Ch)
}
else if (nCount < length())
{
- _header()->nLength = nCount;
+ _header()->nLength = static_cast(nCount);
m_str[length()] = 0; // Make null terminated string.
}
}
@@ -1971,7 +1971,7 @@ inline CryStringT& CryStringT::erase(size_type nIndex, size_type nCount)
_MakeUnique();
size_type nNumToCopy = length() - (nIndex + nCount) + 1;
_move(m_str + nIndex, m_str + nIndex + nCount, nNumToCopy);
- _header()->nLength = length() - nCount;
+ _header()->nLength = static_cast(length() - nCount);
}
return *this;
@@ -2013,7 +2013,7 @@ inline CryStringT& CryStringT::insert(size_type nIndex, size_type nCount,
_move(m_str + nIndex + nCount, m_str + nIndex, (nNewLength - nIndex - nCount) + 1);
_set(m_str + nIndex, ch, nCount);
- _header()->nLength = nNewLength;
+ _header()->nLength = static_cast(nNewLength);
CRY_STRING_DEBUG(m_str)
return *this;
@@ -2050,7 +2050,7 @@ inline CryStringT& CryStringT::insert(size_type nIndex, const_str pstr, si
_move(m_str + nIndex + nInsertLength, m_str + nIndex, (nNewLength - nIndex - nInsertLength + 1));
_copy(m_str + nIndex, pstr, nInsertLength);
- _header()->nLength = nNewLength;
+ _header()->nLength = static_cast(nNewLength);
m_str[length()] = 0;
}
CRY_STRING_DEBUG(m_str)
@@ -2164,7 +2164,7 @@ inline CryStringT& CryStringT::replace(const_str strOld, const_str strNew)
}
strStart += _strlen(strStart) + 1;
}
- _header()->nLength = nNewLength;
+ _header()->nLength = static_cast(nNewLength);
}
CRY_STRING_DEBUG(m_str)
@@ -2289,7 +2289,7 @@ inline CryStringT& CryStringT::TrimRight(const value_type* sCharSet)
// Just shrink length of the string.
size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
_MakeUnique();
- _header()->nLength = nNewLength;
+ _header()->nLength = static_cast(nNewLength);
m_str[nNewLength] = 0;
}
@@ -2317,7 +2317,7 @@ inline CryStringT& CryStringT::TrimRight()
// Just shrink length of the string.
size_type nNewLength = (size_type)(str - m_str) + 1; // m_str can change in _MakeUnique
_MakeUnique();
- _header()->nLength = nNewLength;
+ _header()->nLength = static_cast(nNewLength);
m_str[nNewLength] = 0;
}
@@ -2353,7 +2353,7 @@ inline CryStringT& CryStringT::TrimLeft(const value_type* sCharSet)
_MakeUnique();
size_type nNewLength = length() - nOff;
_move(m_str, m_str + nOff, nNewLength + 1);
- _header()->nLength = nNewLength;
+ _header()->nLength = static_cast(nNewLength);
m_str[nNewLength] = 0;
}
@@ -2376,7 +2376,7 @@ inline CryStringT& CryStringT::TrimLeft()
_MakeUnique();
size_type nNewLength = length() - nOff;
_move(m_str, m_str + nOff, nNewLength + 1);
- _header()->nLength = nNewLength;
+ _header()->nLength = static_cast(nNewLength);
m_str[nNewLength] = 0;
}
diff --git a/Code/Legacy/CryCommon/IIndexedMesh.h b/Code/Legacy/CryCommon/IIndexedMesh.h
index cb19656e35..87c3df98bd 100644
--- a/Code/Legacy/CryCommon/IIndexedMesh.h
+++ b/Code/Legacy/CryCommon/IIndexedMesh.h
@@ -2094,7 +2094,7 @@ public:
{
if (activeStreams & (1U << i))
{
- nMeshSize += ((i == VSF_GENERAL) ? sizeof(SVF_P3S_C4B_T2S) : cSizeStream[i]) * GetVertexCount();
+ nMeshSize += static_cast(((i == VSF_GENERAL) ? sizeof(SVF_P3S_C4B_T2S) : cSizeStream[i]) * GetVertexCount());
nMeshSize += TARGET_DEFAULT_ALIGN - (nMeshSize & (TARGET_DEFAULT_ALIGN - 1));
}
}
diff --git a/Code/Legacy/CryCommon/IShader.h b/Code/Legacy/CryCommon/IShader.h
index 3a49e4d1ac..d445c21b1d 100644
--- a/Code/Legacy/CryCommon/IShader.h
+++ b/Code/Legacy/CryCommon/IShader.h
@@ -1426,9 +1426,9 @@ struct STexSamplerFX
SAFE_RELEASE(m_pITarget);
}
- int Size()
+ size_t Size()
{
- int nSize = sizeof(*this);
+ size_t nSize = sizeof(*this);
nSize += m_szName.capacity();
nSize += m_szTexture.capacity();
#if SHADER_REFLECT_TEXTURE_SLOTS
@@ -1805,9 +1805,9 @@ struct SEfResTexture
return m_Ext.m_pTexModifier;
}
- int Size() const
+ size_t Size() const
{
- int nSize = sizeof(SEfResTexture) - sizeof(STexSamplerRT) - sizeof(SEfResTextureExt);
+ size_t nSize = sizeof(SEfResTexture) - sizeof(STexSamplerRT) - sizeof(SEfResTextureExt);
nSize += m_Name.size();
nSize += m_Sampler.Size();
nSize += m_Ext.Size();
@@ -1900,9 +1900,9 @@ struct SBaseShaderResources
uint8 m_VoxelCoverage;
- int Size() const
+ size_t Size() const
{
- int nSize = sizeof(SBaseShaderResources) + m_ShaderParams.size() * sizeof(SShaderParam);
+ size_t nSize = sizeof(SBaseShaderResources) + m_ShaderParams.size() * sizeof(SShaderParam);
return nSize;
}
@@ -2032,9 +2032,9 @@ struct SInputShaderResources
TexturesResourcesMap m_TexturesResourcesMap; // a map of all textures resources used by the shader by name
SDeformInfo m_DeformInfo;
- int Size() const
+ size_t Size() const
{
- int nSize = SBaseShaderResources::Size();// -sizeof(SEfResTexture) * m_TexturesResourcesMap.size();
+ size_t nSize = SBaseShaderResources::Size();// -sizeof(SEfResTexture) * m_TexturesResourcesMap.size();
nSize += m_TexturePath.size();
nSize += sizeof(SDeformInfo);
diff --git a/Code/Legacy/CryCommon/UnicodeBinding.h b/Code/Legacy/CryCommon/UnicodeBinding.h
index 6bfa846035..e6e82aaf49 100644
--- a/Code/Legacy/CryCommon/UnicodeBinding.h
+++ b/Code/Legacy/CryCommon/UnicodeBinding.h
@@ -843,7 +843,7 @@ namespace Unicode
{
const size_t offset = Append ? out.size() : 0;
length += offset;
- out.resize(length); // resize() can't fail without exceptions, so assert instead.
+ out.resize(static_cast(length)); // resize() can't fail without exceptions, so assert instead.
assert((out.size() == length) && "Buffer resize failed (out-of-memory?)");
const CharType* base = length ? out.data() : 0;
ptr = const_cast(base + offset);
diff --git a/Code/Legacy/CryCommon/VectorMap.h b/Code/Legacy/CryCommon/VectorMap.h
index 0f2b7e57e4..1a42f0e48f 100644
--- a/Code/Legacy/CryCommon/VectorMap.h
+++ b/Code/Legacy/CryCommon/VectorMap.h
@@ -408,8 +408,7 @@ typename VectorMap::key_compare VectorMap::key_comp() co
template
typename VectorMap::iterator VectorMap::lower_bound(const key_type& key)
{
- int count = 0;
- count = m_entries.size();
+ int count = static_cast(m_entries.size());
iterator first = m_entries.begin();
iterator last = m_entries.end();
for (; 0 < count; )
@@ -432,8 +431,7 @@ typename VectorMap::iterator VectorMap::lower_bound(cons
template
typename VectorMap::const_iterator VectorMap::lower_bound(const key_type& key) const
{
- int count = 0;
- count = m_entries.size();
+ int count = static_cast(m_entries.size());
const_iterator first = m_entries.begin();
const_iterator last = m_entries.end();
for (; 0 < count; )
diff --git a/Code/Legacy/CryCommon/platform.h b/Code/Legacy/CryCommon/platform.h
index b3846b88dd..6aad8dd043 100644
--- a/Code/Legacy/CryCommon/platform.h
+++ b/Code/Legacy/CryCommon/platform.h
@@ -475,8 +475,6 @@ ILINE DestinationType alias_cast(SourceType pPtr)
return conv_union.pDst;
}
-#include "CryLegacyAllocator.h"
-
//////////////////////////////////////////////////////////////////////////
#ifndef DEPRECATED
#define DEPRECATED
diff --git a/Code/Legacy/CrySystem/ConsoleBatchFile.cpp b/Code/Legacy/CrySystem/ConsoleBatchFile.cpp
index 6e36780ac0..69bbfc281d 100644
--- a/Code/Legacy/CrySystem/ConsoleBatchFile.cpp
+++ b/Code/Legacy/CrySystem/ConsoleBatchFile.cpp
@@ -112,7 +112,7 @@ bool CConsoleBatchFile::ExecuteConfigFile(const char* sFilename)
CryLog("%s \"%s\" found in %s ...", szLog, PathUtil::GetFile(filenameLog.c_str()), PathUtil::GetPath(filenameLog).c_str());
}
- int nLen = file.GetLength();
+ size_t nLen = file.GetLength();
char* sAllText = new char [nLen + 16];
file.ReadRaw(sAllText, nLen);
sAllText[nLen] = '\0';
diff --git a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
index dc2526f213..e2ddc324bb 100644
--- a/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
+++ b/Code/Legacy/CrySystem/LevelSystem/LevelSystem.cpp
@@ -161,7 +161,7 @@ struct SLevelNameAutoComplete
: public IConsoleArgumentAutoComplete
{
AZStd::vector levels;
- virtual int GetCount() const { return levels.size(); };
+ virtual int GetCount() const { return static_cast(levels.size()); };
virtual const char* GetValue(int nIndex) const { return levels[nIndex].c_str(); };
};
// definition and declaration must be separated for devirtualization
diff --git a/Code/Legacy/CrySystem/LocalizedStringManager.cpp b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
index ce39f08480..38f8ffc5b6 100644
--- a/Code/Legacy/CrySystem/LocalizedStringManager.cpp
+++ b/Code/Legacy/CrySystem/LocalizedStringManager.cpp
@@ -479,7 +479,7 @@ void CLocalizedStringsManager::ParseFirstLine(IXmlTableReader* pXmlTableReader,
if (i == ELOCALIZED_COLUMN_SOUNDMOOD)
{
const char* pSoundMoodName = pFind + strlen(sLocalizedColumnNames[i]) + 1;
- int nSoundMoodNameLength = sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1;
+ int nSoundMoodNameLength = static_cast(sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1);
if (nSoundMoodNameLength > 0)
{
SoundMoodIndex[nCellIndex] = pSoundMoodName;
@@ -490,7 +490,7 @@ void CLocalizedStringsManager::ParseFirstLine(IXmlTableReader* pXmlTableReader,
if (i == ELOCALIZED_COLUMN_EVENTPARAMETER)
{
const char* pParameterName = pFind + strlen(sLocalizedColumnNames[i]) + 1;
- int nParameterNameLength = sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1;
+ int nParameterNameLength = static_cast(sCellContent.length() - strlen(sLocalizedColumnNames[i]) - 1);
if (nParameterNameLength > 0)
{
EventParameterIndex[nCellIndex] = pParameterName;
@@ -622,7 +622,7 @@ bool CLocalizedStringsManager::InitLocalizationData(
CRY_ASSERT(m_tagFileNames.size() < 255);
- uint8 curNumTags = m_tagFileNames.size();
+ uint8 curNumTags = static_cast(m_tagFileNames.size());
m_tagFileNames[sType].filenames = vEntries;
m_tagFileNames[sType].id = curNumTags + 1;
@@ -757,7 +757,7 @@ bool CLocalizedStringsManager::ReleaseLocalizationDataByTag(
bool bVecEntryErased = false;
//Then remove the entries in the storage vector
- const uint32 numEntries = m_pLanguage->m_vLocalizedStrings.size();
+ const int32 numEntries = static_cast(m_pLanguage->m_vLocalizedStrings.size());
for (int32 i = numEntries - 1; i >= 0; i--)
{
SLocalizedStringEntry* entry = m_pLanguage->m_vLocalizedStrings[i];
@@ -1405,7 +1405,7 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName,
// SoundMood Entries
{
- pEntry->SoundMoods.resize(SoundMoodValues.size());
+ pEntry->SoundMoods.resize(static_cast(SoundMoodValues.size()));
if (SoundMoodValues.size() > 0)
{
std::map::const_iterator itEnd = SoundMoodValues.end();
@@ -1421,7 +1421,7 @@ bool CLocalizedStringsManager::DoLoadExcelXmlSpreadsheet(const char* sFileName,
// EventParameter Entries
{
- pEntry->EventParameters.resize(EventParameterValues.size());
+ pEntry->EventParameters.resize(static_cast(EventParameterValues.size()));
if (EventParameterValues.size() > 0)
{
std::map::const_iterator itEnd = EventParameterValues.end();
@@ -2196,7 +2196,7 @@ int CLocalizedStringsManager::GetLocalizedStringCount()
{
return 0;
}
- return m_pLanguage->m_vLocalizedStrings.size();
+ return static_cast(m_pLanguage->m_vLocalizedStrings.size());
}
//////////////////////////////////////////////////////////////////////////
@@ -2310,10 +2310,10 @@ void InternalFormatStringMessage(StringClass& outString, const StringClass& sStr
int maxArgUsed = 0;
int lastPos = 0;
int curPos = 0;
- const int sourceLen = sString.length();
+ const int sourceLen = static_cast(sString.length());
while (true)
{
- int foundPos = sString.find(token, curPos);
+ int foundPos = static_cast(sString.find(token, curPos));
if (foundPos != string::npos)
{
if (foundPos + 1 < sourceLen)
diff --git a/Code/Legacy/CrySystem/Log.cpp b/Code/Legacy/CrySystem/Log.cpp
index d2d8495063..96bc29b58a 100644
--- a/Code/Legacy/CrySystem/Log.cpp
+++ b/Code/Legacy/CrySystem/Log.cpp
@@ -484,7 +484,7 @@ void CLog::LogV(const ELogType type, [[maybe_unused]]int flags, const char* szFo
break;
}
- int bufferlen = sizeof(szBuffer) - prefixSize;
+ int bufferlen = static_cast(sizeof(szBuffer) - prefixSize);
if (bufferlen > 0)
{
#if defined(AZ_RESTRICTED_PLATFORM)
diff --git a/Code/Legacy/CrySystem/SimpleStringPool.h b/Code/Legacy/CrySystem/SimpleStringPool.h
index ddeca0f44c..d1a618425c 100644
--- a/Code/Legacy/CrySystem/SimpleStringPool.h
+++ b/Code/Legacy/CrySystem/SimpleStringPool.h
@@ -216,8 +216,8 @@ public:
CryFatalError("Can't replace strings in an xml node that reuses strings");
}
- int nStrLen1 = strlen(str1);
- int nStrLen2 = strlen(str2);
+ int nStrLen1 = static_cast(strlen(str1));
+ int nStrLen2 = static_cast(strlen(str2));
// undo ptr1 add.
if (m_ptr != m_start)
diff --git a/Code/Legacy/CrySystem/SystemCFG.cpp b/Code/Legacy/CrySystem/SystemCFG.cpp
index 719928384b..4ab203ded1 100644
--- a/Code/Legacy/CrySystem/SystemCFG.cpp
+++ b/Code/Legacy/CrySystem/SystemCFG.cpp
@@ -285,7 +285,7 @@ public:
pos = 1;
for (;; )
{
- pos = szValue.find_first_of("\\", pos);
+ pos = static_cast(szValue.find_first_of("\\", pos));
if (pos == string::npos)
{
@@ -300,7 +300,7 @@ public:
pos = 1;
for (;; )
{
- pos = szValue.find_first_of("\"", pos);
+ pos = static_cast(szValue.find_first_of("\"", pos));
if (pos == string::npos)
{
@@ -414,7 +414,7 @@ bool CSystemConfiguration::ParseSystemConfig()
INDENT_LOG_DURING_SCOPE();
- int nLen = file.GetLength();
+ int nLen = static_cast(file.GetLength());
if (nLen == 0)
{
CryWarning(VALIDATOR_MODULE_SYSTEM, VALIDATOR_WARNING, "Couldn't get length for Config file %s", filename.c_str());
diff --git a/Code/Legacy/CrySystem/ViewSystem/View.cpp b/Code/Legacy/CrySystem/ViewSystem/View.cpp
index e1191f0a17..d8dc24123c 100644
--- a/Code/Legacy/CrySystem/ViewSystem/View.cpp
+++ b/Code/Legacy/CrySystem/ViewSystem/View.cpp
@@ -103,7 +103,7 @@ void CView::SetViewShakeEx(const SShakeParams& params)
return;
}
- int shakes(m_shakes.size());
+ int shakes = static_cast(m_shakes.size());
SShake* pSetShake(NULL);
for (int i = 0; i < shakes; ++i)
@@ -180,7 +180,7 @@ void CView::ProcessShaking(float frameTime)
m_viewParams.shakingRatio = 0;
m_viewParams.groundOnly = false;
- int shakes(m_shakes.size());
+ int shakes = static_cast(m_shakes.size());
for (int i = 0; i < shakes; ++i)
{
ProcessShake(&m_shakes[i], frameTime);
@@ -486,7 +486,7 @@ void CView::ProcessShakeNormal_DoShaking(SShake* pShake, float frameTime)
//------------------------------------------------------------------------
void CView::StopShake(int shakeID)
{
- uint32 num = m_shakes.size();
+ uint32 num = static_cast(m_shakes.size());
for (uint32 i = 0; i < num; ++i)
{
if (m_shakes[i].ID == shakeID && m_shakes[i].updating)
diff --git a/Code/Legacy/CrySystem/XConsole.cpp b/Code/Legacy/CrySystem/XConsole.cpp
index 09b3182c04..a2f3426d5c 100644
--- a/Code/Legacy/CrySystem/XConsole.cpp
+++ b/Code/Legacy/CrySystem/XConsole.cpp
@@ -1341,7 +1341,7 @@ bool CXConsole::ProcessInput(const AzFramework::InputChannel& inputChannel)
{
if (isCtrlModifierActive)
{
- m_nScrollLine = m_dqConsoleBuffer.size() - 1;
+ m_nScrollLine = static_cast(m_dqConsoleBuffer.size() - 1);
}
else
{
@@ -1454,7 +1454,7 @@ bool CXConsole::GetLineNo(const int indwLineNo, char* outszBuffer, const int ind
//////////////////////////////////////////////////////////////////////////
int CXConsole::GetLineCount() const
{
- return m_dqConsoleBuffer.size();
+ return static_cast(m_dqConsoleBuffer.size());
}
//////////////////////////////////////////////////////////////////////////
@@ -2675,7 +2675,7 @@ void CXConsole::RemoveOutputPrintSink(IOutputPrintSink* inpSink)
{
assert(inpSink);
- int nCount = m_OutputSinks.size();
+ int nCount = static_cast(m_OutputSinks.size());
for (int i = 0; i < nCount; i++)
{
@@ -2965,7 +2965,7 @@ bool CXConsole::IsHashCalculated()
//////////////////////////////////////////////////////////////////////////
int CXConsole::GetNumCheatVars()
{
- return m_randomCheckedVariables.size();
+ return static_cast(m_randomCheckedVariables.size());
}
//////////////////////////////////////////////////////////////////////////
diff --git a/Code/Legacy/CrySystem/XConsole.h b/Code/Legacy/CrySystem/XConsole.h
index eca52771dd..1fee015f22 100644
--- a/Code/Legacy/CrySystem/XConsole.h
+++ b/Code/Legacy/CrySystem/XConsole.h
@@ -70,7 +70,7 @@ struct CConsoleCommandArgs
CConsoleCommandArgs(string& line, std::vector& args)
: m_line(line)
, m_args(args) {};
- virtual int GetArgCount() const { return m_args.size(); };
+ virtual int GetArgCount() const { return static_cast(m_args.size()); };
// Get argument by index, nIndex must be in 0 <= nIndex < GetArgCount()
virtual const char* GetArg(int nIndex) const
{
diff --git a/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp b/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp
index 2a532befd3..def45f27de 100644
--- a/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp
+++ b/Code/Legacy/CrySystem/XML/WriteXMLSource.cpp
@@ -190,8 +190,9 @@ bool SaveArray(const IdTable& idTable, XmlNodeRef& definition, XmlNodeRef& data,
}
bool needIndex = false;
- for (size_t i = 1; i <= numElems; i++)
+ for (size_t sizei = 1; sizei <= numElems; sizei++)
{
+ const int i = static_cast(sizei);
if (!childSource->HaveElemAt(i))
{
needIndex = true;
diff --git a/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
index 60e0d2e4f1..1500717ddc 100644
--- a/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
+++ b/Code/Legacy/CrySystem/XML/XMLBinaryWriter.cpp
@@ -114,26 +114,26 @@ bool XMLBinary::CXMLBinaryWriter::WriteNode(IDataWriter* pFile, XmlNodeRef node,
nTheoreticalPosition += sizeof(header);
align(nTheoreticalPosition, nAlignment);
- header.nNodeTablePosition = nTheoreticalPosition;
+ header.nNodeTablePosition = static_cast(nTheoreticalPosition);
header.nNodeCount = int(m_nodes.size());
nTheoreticalPosition += header.nNodeCount * sizeof(Node);
align(nTheoreticalPosition, nAlignment);
- header.nChildTablePosition = nTheoreticalPosition;
+ header.nChildTablePosition = static_cast(nTheoreticalPosition);
header.nChildCount = int(m_childs.size());
nTheoreticalPosition += header.nChildCount * sizeof(NodeIndex);
align(nTheoreticalPosition, nAlignment);
- header.nAttributeTablePosition = nTheoreticalPosition;
+ header.nAttributeTablePosition = static_cast(nTheoreticalPosition);
header.nAttributeCount = int(m_attributes.size());
nTheoreticalPosition += header.nAttributeCount * sizeof(Attribute);
align(nTheoreticalPosition, nAlignment);
- header.nStringDataPosition = nTheoreticalPosition;
+ header.nStringDataPosition = static_cast(nTheoreticalPosition);
header.nStringDataSize = m_nStringDataSize;
nTheoreticalPosition += header.nStringDataSize;
- header.nXMLSize = nTheoreticalPosition;
+ header.nXMLSize = static_cast(nTheoreticalPosition);
// Swap endianness of the data structures
if (bNeedSwapEndian)
@@ -328,7 +328,7 @@ int XMLBinary::CXMLBinaryWriter::AddString(const XmlString& sString)
// We don't have such string yet, so we should add it to the tables.
m_strings.push_back(sString);
itStringEntry = m_stringMap.insert(StringMap::value_type(sString, m_nStringDataSize)).first;
- m_nStringDataSize += sString.length() + 1;
+ m_nStringDataSize += static_cast(sString.length() + 1);
}
// Return offset of the string in the string data buffer.
diff --git a/Code/Legacy/CrySystem/XML/XmlUtils.cpp b/Code/Legacy/CrySystem/XML/XmlUtils.cpp
index 1b341ee99e..16ddc6c992 100644
--- a/Code/Legacy/CrySystem/XML/XmlUtils.cpp
+++ b/Code/Legacy/CrySystem/XML/XmlUtils.cpp
@@ -91,7 +91,7 @@ XmlNodeRef CXmlUtils::LoadXmlFromFile(const char* sFilename, bool bReuseStrings,
XmlNodeRef CXmlUtils::LoadXmlFromBuffer(const char* buffer, size_t size, bool bReuseStrings, bool bSuppressWarnings)
{
XmlParser parser(bReuseStrings);
- XmlNodeRef node = parser.ParseBuffer(buffer, size, true, bSuppressWarnings);
+ XmlNodeRef node = parser.ParseBuffer(buffer, static_cast(size), true, bSuppressWarnings);
return node;
}
@@ -111,7 +111,7 @@ const char* CXmlUtils::HashXml(XmlNodeRef node)
static char temp[16];
static const char* hex = "0123456789abcdef";
XmlString str = node->getXML();
- GetMD5(str.data(), str.length(), temp);
+ GetMD5(str.data(), static_cast(str.length()), temp);
for (int i = 0; i < 16; i++)
{
signature[2 * i + 0] = hex[((uint8)temp[i]) >> 4];
diff --git a/Code/Legacy/CrySystem/XML/xml.cpp b/Code/Legacy/CrySystem/XML/xml.cpp
index 5761d8a963..0493a64ca8 100644
--- a/Code/Legacy/CrySystem/XML/xml.cpp
+++ b/Code/Legacy/CrySystem/XML/xml.cpp
@@ -655,7 +655,7 @@ XmlNodeRef CXmlNode::findChild(const char* tag) const
if (m_pChilds)
{
XmlNodes& childs = *m_pChilds;
- for (int i = 0, num = childs.size(); i < num; ++i)
+ for (int i = 0, num = static_cast(childs.size()); i < num; ++i)
{
if (childs[i]->isTag(tag))
{
@@ -690,7 +690,7 @@ void CXmlNode::deleteChild(const char* tag)
if (m_pChilds)
{
XmlNodes& childs = *m_pChilds;
- for (int i = 0, num = childs.size(); i < num; ++i)
+ for (int i = 0, num = static_cast(childs.size()); i < num; ++i)
{
if (childs[i]->isTag(tag))
{
@@ -913,7 +913,7 @@ XmlNodeRef CXmlNode::clone()
node->m_pChilds = new XmlNodes;
node->m_pChilds->reserve(childs.size());
- for (int i = 0, num = childs.size(); i < num; ++i)
+ for (int i = 0, num = static_cast(childs.size()); i < num; ++i)
{
node->addChild(childs[i]->clone());
}
@@ -956,7 +956,7 @@ static void AddTabsToString(XmlString& xml, int level)
//////////////////////////////////////////////////////////////////////////
bool CXmlNode::IsValidXmlString(const char* str) const
{
- int len = strlen(str);
+ int len = static_cast(strlen(str));
{
// Prevents invalid characters not from standard ASCII set to propagate to xml.
@@ -1432,7 +1432,7 @@ protected:
void XmlParserImp::CleanStack()
{
m_nNodeStackTop = 0;
- for (int i = 0, num = m_nodeStack.size(); i < num; i++)
+ for (int i = 0, num = static_cast(m_nodeStack.size()); i < num; i++)
{
m_nodeStack[i].node = 0;
m_nodeStack[i].childs.resize(0);
diff --git a/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
index 4f1e7a6337..e59bdfa8ac 100644
--- a/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
+++ b/Code/Tools/AssetBundler/source/ui/PlatformSelectionWidget.cpp
@@ -34,7 +34,7 @@ namespace AssetBundler
for (const AZStd::string_view& platformString : m_platformHelper->GetPlatforms(PlatformFlags::AllNamedPlatforms))
{
// Create the CheckBox and store what platform it maps to
- QSharedPointer platformCheckBox(new QCheckBox(QString::fromUtf8(platformString.data(), platformString.size())));
+ QSharedPointer platformCheckBox(new QCheckBox(QString::fromUtf8(platformString.data(), static_cast(platformString.size()))));
m_platformCheckBoxes.push_back(platformCheckBox);
PlatformFlags currentPlatformFlag = m_platformHelper->GetPlatformFlag(platformString);
m_platformList.push_back(currentPlatformFlag);
diff --git a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
index eb0416f125..64e176ffe4 100644
--- a/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
+++ b/Code/Tools/AssetProcessor/native/AssetManager/SourceFileRelocator.cpp
@@ -88,7 +88,7 @@ Please note that only those seed files will get updated that are active for your
{
scanFolderInfo = nullptr;
bool isRelative = AzFramework::StringFunc::Path::IsRelative(normalizedSource.c_str());
-
+
if (isRelative)
{
// Relative paths can match multiple files/folders, search each scan folder for a valid match
@@ -264,7 +264,7 @@ Please note that only those seed files will get updated that are active for your
metaDataFile.m_sourceFileIndex = sourceFileIndex.value();
metadataFiles.emplace_back(metaDataFile);
metaDataFileEntries.insert(metadaFileCorrectCase);
- }
+ }
}
}
}
@@ -601,7 +601,7 @@ Please note that only those seed files will get updated that are active for your
AZ::StringFunc::Path::ReplaceFullName(newDestinationPath, fullFileName.c_str());
}
-
+
if (!AzFramework::StringFunc::Path::IsRelative(newDestinationPath.c_str()))
{
@@ -1025,14 +1025,14 @@ Please note that only those seed files will get updated that are active for your
AZStd::binary_semaphore waitSignal;
int errorCount = 0;
- AzToolsFramework::SourceControlResponseCallbackBulk callback = AZStd::bind(&HandleSourceControlResult,
- AZStd::ref (relocationContainer),
- AZStd::ref(waitSignal),
- AZStd::ref(errorCount),
- static_cast(SCF_OpenByUser), // If a file is moved from A -> B and then again from B -> A, the result is just an "edit", so we're just going to assume success if the file is checked out, regardless of state
- true,
- AZStd::placeholders::_1,
- AZStd::placeholders::_2);
+ AzToolsFramework::SourceControlResponseCallbackBulk callback = [&](bool success, AZStd::vector info)
+ {
+ HandleSourceControlResult(
+ relocationContainer, waitSignal, errorCount,
+ SCF_OpenByUser, // If a file is moved from A -> B and then again from B -> A, the result is just an "edit", so we're just going
+ // to assume success if the file is checked out, regardless of state
+ true, success, info);
+ };
AzToolsFramework::SourceControlCommandBus::Broadcast(&AzToolsFramework::SourceControlCommandBus::Events::RequestRenameBulkExtended,
@@ -1049,7 +1049,7 @@ Please note that only those seed files will get updated that are active for your
{
if (relocationInfo.m_operationStatus == SourceFileRelocationStatus::Succeeded || relocationInfo.m_sourceFileIndex == AssetProcessor::SourceFileRelocationInvalidIndex)
{
- // we do not want to retry if the move operation already succeeded or if it is a source file
+ // we do not want to retry if the move operation already succeeded or if it is a source file
continue;
}
@@ -1108,7 +1108,7 @@ Please note that only those seed files will get updated that are active for your
{
if (entry.m_operationStatus == SourceFileRelocationStatus::Succeeded || entry.m_sourceFileIndex == AssetProcessor::SourceFileRelocationInvalidIndex)
{
- // we do not want to retry if the move operation already succeeded or if it is a source file
+ // we do not want to retry if the move operation already succeeded or if it is a source file
continue;
}
@@ -1224,7 +1224,7 @@ Please note that only those seed files will get updated that are active for your
m_stateData->QuerySourceByProductID(productDependency.m_productPK, [this, &sourceName, &scanPath](AzToolsFramework::AssetDatabase::SourceDatabaseEntry& entry)
{
sourceName = entry.m_sourceName;
-
+
m_stateData->QueryScanFolderByScanFolderID(entry.m_scanFolderPK, [&scanPath](AzToolsFramework::AssetDatabase::ScanFolderDatabaseEntry& entry)
{
scanPath = entry.m_scanFolder;
diff --git a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
index 08546365c5..27210685fc 100644
--- a/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
+++ b/Code/Tools/AssetProcessor/native/resourcecompiler/RCBuilder.cpp
@@ -322,7 +322,7 @@ namespace AssetProcessor
executableDirectory /= ASSETPROCESSOR_TRAIT_LEGACY_RC_RELATIVE_PATH;
if (AZ::IO::SystemFile::Exists(executableDirectory.c_str()))
{
- rcAbsolutePathOut = QString::fromUtf8(executableDirectory.c_str(), executableDirectory.Native().size());
+ rcAbsolutePathOut = QString::fromUtf8(executableDirectory.c_str(), static_cast(executableDirectory.Native().size()));
return true;
}
diff --git a/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
index 24faf2ccaa..d4ef5b3ba8 100644
--- a/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
+++ b/Code/Tools/RemoteConsole/Core/RemoteConsoleCore.cpp
@@ -323,7 +323,7 @@ bool SRemoteServer::ReadBuffer(const char* buffer, int data)
}
// Advance to the next null terminated string in the buffer
- const int currentSize = strnlen(curBuffer, bytesRemaining);
+ const int currentSize = static_cast(strnlen(curBuffer, bytesRemaining));
bytesRemaining -= currentSize + 1;
curBuffer += currentSize + 1;
}
@@ -466,7 +466,7 @@ void SRemoteClient::FillAutoCompleteList(AZStd::vector& list)
AZStd::string item = "map ";
const char* levelName = pLevel->GetName();
int start = 0;
- for (int k = 0, kend = strlen(levelName); k < kend; ++k)
+ for (int k = 0, kend = static_cast(strlen(levelName)); k < kend; ++k)
{
if ((levelName[k] == '\\' || levelName[k] == '/') && k + 1 < kend)
{
diff --git a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp
index 1b712cb134..aadb834aa9 100644
--- a/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp
+++ b/Code/Tools/SceneAPI/SceneBuilder/Importers/AssImpAnimationImporter.cpp
@@ -634,21 +634,21 @@ namespace AZ
AZStd::shared_ptr morphAnimNode =
AZStd::make_shared();
- const size_t numKeyFrames = GetNumKeyFrames(keys.size(), animation->mDuration, animation->mTicksPerSecond);
+ const size_t numKeyFrames = GetNumKeyFrames(static_cast(keys.size()), animation->mDuration, animation->mTicksPerSecond);
morphAnimNode->ReserveKeyFrames(numKeyFrames);
morphAnimNode->SetTimeStepBetweenFrames(s_defaultTimeStepBetweenFrames);
aiAnimMesh* aiAnimMesh = mesh->mAnimMeshes[meshIdx];
AZStd::string_view nodeName(aiAnimMesh->mName.C_Str());
- const AZ::u32 maxKeys = keys.size();
+ const AZ::u32 maxKeys = static_cast(keys.size());
AZ::u32 keyIdx = 0;
for (AZ::u32 frame = 0; frame < numKeyFrames; ++frame)
{
const double time = GetTimeForFrame(frame, animation->mTicksPerSecond);
float weight = 0;
- if (!SampleKeyFrame(weight, keys, keys.size(), time + keyOffset, keyIdx))
+ if (!SampleKeyFrame(weight, keys, static_cast(keys.size()), time + keyOffset, keyIdx))
{
return Events::ProcessingResult::Failure;
}
diff --git a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
index 4de52e0f78..266791e05c 100644
--- a/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
+++ b/Code/Tools/TestImpactFramework/Runtime/Code/Source/Dependency/TestImpactSourceCoveringTestsSerializer.cpp
@@ -50,8 +50,8 @@ namespace TestImpact
AZStd::vector coveringTests;
sourceCoveringTests.reserve(1U << 16); // Reserve for approx. 65k source files
const AZStd::string delim = "\n";
- auto start = 0U;
- auto end = sourceCoveringTestsListString.find(delim);
+ size_t start = 0U;
+ size_t end = sourceCoveringTestsListString.find(delim);
while (end != AZStd::string::npos)
{
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h
index e9c30566cd..ad160303f7 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceJobUtil.h
@@ -43,8 +43,7 @@ namespace AWSCore
if (urlSections.size() > ExpectedUrlSections)
{
- int i;
- i = urlSections[ExpectedUrlSections - 1].find('.');
+ int i = static_cast(urlSections[ExpectedUrlSections - 1].find('.'));
if (i != -1)
{
// Handle APIGateway URLs with custom domains:
diff --git a/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h b/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h
index 20b94d6e1a..cd0686c2d0 100644
--- a/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h
+++ b/Gems/AWSCore/Code/Include/Public/Framework/ServiceRequestJob.h
@@ -391,7 +391,7 @@ namespace AWSCore
int offset = 0;
while (offset < message.size())
{
- int count = (offset + MAX_MESSAGE_LENGTH < message.size()) ? MAX_MESSAGE_LENGTH : message.size() - offset;
+ int count = static_cast((offset + MAX_MESSAGE_LENGTH < message.size()) ? MAX_MESSAGE_LENGTH : message.size() - offset);
AZ_Warning(ServiceClientJobType::COMPONENT_DISPLAY_NAME, false, message.substr(offset, count).c_str());
offset += MAX_MESSAGE_LENGTH;
}
diff --git a/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp b/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp
index 71fe0fc221..d041a97428 100644
--- a/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp
+++ b/Gems/AWSCore/Code/Source/Framework/JsonObjectHandler.cpp
@@ -443,7 +443,7 @@ namespace AWSCore
msg += AZStd::string::format(" at character %zu: ", result.Offset());
const int snippet_size = 40;
- int start = result.Offset() - snippet_size / 2;
+ int start = static_cast(result.Offset() - snippet_size / 2);
int length = snippet_size;
int offset = snippet_size / 2;
if (start < 0) {
diff --git a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp
index 5c80813590..caba8b5ae7 100644
--- a/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp
+++ b/Gems/AWSCore/Code/Tests/ScriptCanvas/AWSScriptBehaviorsComponentTest.cpp
@@ -51,7 +51,7 @@ protected:
TEST_F(AWSScriptBehaviorsComponentTest, Reflect)
{
- int oldEBusNum = m_behaviorContext->m_ebuses.size();
+ int oldEBusNum = static_cast(m_behaviorContext->m_ebuses.size());
m_componentDescriptor.reset(AWSScriptBehaviorsComponent::CreateDescriptor());
m_componentDescriptor->Reflect(m_serializeContext.get());
m_componentDescriptor->Reflect(m_behaviorContext.get());
diff --git a/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp b/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp
index d787cf0bfb..e23c97a5fe 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsEvent.cpp
@@ -58,7 +58,7 @@ namespace AWSMetrics
int MetricsEvent::GetNumAttributes() const
{
- return m_attributes.size();
+ return static_cast(m_attributes.size());
}
size_t MetricsEvent::GetSizeInBytes() const
diff --git a/Gems/AWSMetrics/Code/Source/MetricsManager.cpp b/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
index 680c946b37..5c4d910658 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsManager.cpp
@@ -256,7 +256,7 @@ namespace AWSMetrics
}
m_globalStats.m_numSuccesses++;
- m_globalStats.m_sendSizeInBytes += metricsEvent.GetSizeInBytes();
+ m_globalStats.m_sendSizeInBytes += static_cast(metricsEvent.GetSizeInBytes());
}
else
{
diff --git a/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp b/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp
index cd22bce5e0..ab54fb9e3e 100644
--- a/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp
+++ b/Gems/AWSMetrics/Code/Source/MetricsQueue.cpp
@@ -134,7 +134,7 @@ namespace AWSMetrics
int MetricsQueue::GetNumMetrics() const
{
- return m_metrics.size();
+ return static_cast(m_metrics.size());
}
size_t MetricsQueue::GetSizeInBytes() const
@@ -175,7 +175,7 @@ namespace AWSMetrics
MetricsEvent& curEvent = m_metrics.front();
curNum += 1;
- curSizeInBytes += curEvent.GetSizeInBytes();
+ curSizeInBytes += static_cast(curEvent.GetSizeInBytes());
if (curNum <= maxBatchedRecordsCount && curSizeInBytes <= maxPayloadSizeInBytes)
{
m_sizeSerializedToJson -= curEvent.GetSizeInBytes();
diff --git a/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp b/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp
index 149f23ccf2..2d9990ad1e 100644
--- a/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/MetricsManagerTest.cpp
@@ -452,7 +452,7 @@ namespace AWSMetrics
EXPECT_EQ(stats.m_numErrors, MaxNumMetricsEvents / 2);
EXPECT_EQ(stats.m_numDropped, 0);
- int metricsEventSize = sizeof(AwsMetricsAttributeKeyEventName) - 1 + strlen(AttrValue);
+ int metricsEventSize = static_cast(sizeof(AwsMetricsAttributeKeyEventName) - 1 + strlen(AttrValue));
EXPECT_EQ(stats.m_sendSizeInBytes, metricsEventSize * MaxNumMetricsEvents / 2);
ASSERT_EQ(m_metricsManager->GetNumBufferedMetrics(), MaxNumMetricsEvents / 2);
diff --git a/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp b/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp
index cc05a60798..85a9d8a4a7 100644
--- a/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp
+++ b/Gems/AWSMetrics/Code/Tests/MetricsQueueTest.cpp
@@ -124,7 +124,7 @@ namespace AWSMetrics
queue.AddMetrics(metrics);
}
- int maxCapacity = queue[0].GetSizeInBytes() * NumTestMetrics / 2;
+ int maxCapacity = static_cast(queue[0].GetSizeInBytes() * NumTestMetrics / 2);
ASSERT_EQ(queue.FilterMetricsByPriority(maxCapacity), NumTestMetrics / 2);
ASSERT_EQ(queue.GetNumMetrics(), NumTestMetrics / 2);
@@ -230,7 +230,7 @@ namespace AWSMetrics
{
MetricsEvent metrics;
metrics.AddAttribute(MetricsAttribute(AttrName, AttrValue));
- int sizeOfEachMetrics = metrics.GetSizeInBytes();
+ int sizeOfEachMetrics = static_cast(metrics.GetSizeInBytes());
MetricsQueue queue;
queue.AddMetrics(metrics);
diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp
index 6e9fe1855c..aecac5fa34 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/DebugImGUI.cpp
@@ -201,13 +201,13 @@ namespace AssetMemoryAnalyzer
{
case AllocationCategories::HEAP:
ImGui::Text(FormatUtils::FormatCodePoint(*ap->m_codePoint));
- heapSummary.m_allocationCount = ap->m_allocations.size();
+ heapSummary.m_allocationCount = static_cast(ap->m_allocations.size());
heapSummary.m_allocatedMemory = ap->m_totalAllocatedMemory;
break;
case AllocationCategories::VRAM:
ImGui::Text("%s", ap->m_codePoint->m_file);
- vramSummary.m_allocationCount = ap->m_allocations.size();
+ vramSummary.m_allocationCount = static_cast(ap->m_allocations.size());
vramSummary.m_allocatedMemory = ap->m_totalAllocatedMemory;
break;
}
diff --git a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
index 20a6089323..9f75e62454 100644
--- a/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
+++ b/Gems/AssetMemoryAnalyzer/Code/Source/ExportJSON.cpp
@@ -78,7 +78,7 @@ namespace AssetMemoryAnalyzer
writer.StartObject();
writer.Key("id");
- writer.Int(idCounter++);
+ writer.Int(static_cast(idCounter++));
writer.Key("label");
writer.String(asset.m_id ? asset.m_id : "Root");
@@ -98,7 +98,7 @@ namespace AssetMemoryAnalyzer
{
writer.StartObject();
writer.Key("id");
- writer.Int(idCounter++);
+ writer.Int(static_cast(idCounter++));
writer.Key("label");
writer.String("");
@@ -119,7 +119,7 @@ namespace AssetMemoryAnalyzer
writer.StartObject();
writer.Key("id");
- writer.Int(idCounter++);
+ writer.Int(static_cast(idCounter++));
writer.Key("label");
@@ -127,13 +127,13 @@ namespace AssetMemoryAnalyzer
{
case AllocationCategories::HEAP:
writer.String(FormatUtils::FormatCodePoint(*ap.m_codePoint));
- heapSummary.m_allocationCount = ap.m_allocations.size();
+ heapSummary.m_allocationCount = static_cast(ap.m_allocations.size());
heapSummary.m_allocatedMemory = ap.m_totalAllocatedMemory;
break;
case AllocationCategories::VRAM:
writer.String(ap.m_codePoint->m_file);
- vramSummary.m_allocationCount = ap.m_allocations.size();
+ vramSummary.m_allocationCount = static_cast(ap.m_allocations.size());
vramSummary.m_allocatedMemory = ap.m_totalAllocatedMemory;
break;
}
diff --git a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
index 08b3821b41..ea726dd914 100644
--- a/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/AuxGeom/DynamicPrimitiveProcessor.cpp
@@ -196,13 +196,13 @@ namespace AZ
{
const size_t sourceByteSize = source.size() * sizeof(AuxGeomIndex);
- RHI::Ptr dynamicBuffer = RPI::DynamicDrawInterface::Get()->GetDynamicBuffer(sourceByteSize);
+ RHI::Ptr dynamicBuffer = RPI::DynamicDrawInterface::Get()->GetDynamicBuffer(static_cast(sourceByteSize));
if (!dynamicBuffer)
{
AZ_WarningOnce("AuxGeom", false, "Failed to allocate dynamic buffer of size %d.", sourceByteSize);
return false;
- }
- dynamicBuffer->Write(source.data(), sourceByteSize);
+ }
+ dynamicBuffer->Write(source.data(), static_cast(sourceByteSize));
group.m_indexBufferView = dynamicBuffer->GetIndexBufferView(RHI::IndexFormat::Uint32);
return true;
}
@@ -211,13 +211,13 @@ namespace AZ
{
const size_t sourceByteSize = source.size() * sizeof(AuxGeomDynamicVertex);
- RHI::Ptr dynamicBuffer = RPI::DynamicDrawInterface::Get()->GetDynamicBuffer(sourceByteSize);
+ RHI::Ptr dynamicBuffer = RPI::DynamicDrawInterface::Get()->GetDynamicBuffer(static_cast(sourceByteSize));
if (!dynamicBuffer)
{
AZ_WarningOnce("AuxGeom", false, "Failed to allocate dynamic buffer of size %d.", sourceByteSize);
return false;
- }
- dynamicBuffer->Write(source.data(), sourceByteSize);
+ }
+ dynamicBuffer->Write(source.data(), static_cast(sourceByteSize));
group.m_streamBufferViews[0] = dynamicBuffer->GetStreamBufferView(sizeof(AuxGeomDynamicVertex));
return true;
}
diff --git a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
index b1456f82fe..089adf4621 100644
--- a/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/CoreLights/PolygonLightFeatureProcessor.cpp
@@ -145,7 +145,7 @@ namespace AZ::Render
// individual point as its own element instead of each array being its own element. Since all
// the arrays are stored in a contiguous vector, we can treat it as one giant array.
const LightPosition* firstPosition = m_polygonLightData.GetDataVector<1>().at(0).data();
- m_lightPolygonPointBufferHandler.UpdateBuffer(firstPosition, m_polygonLightData.GetDataCount() * MaxPolygonPoints);
+ m_lightPolygonPointBufferHandler.UpdateBuffer(firstPosition, static_cast(m_polygonLightData.GetDataCount() * MaxPolygonPoints));
}
m_deviceBufferNeedsUpdate = false;
}
diff --git a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
index 96041dc89d..4b1a6ec7f6 100644
--- a/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/FrameCaptureSystemComponent.cpp
@@ -65,7 +65,7 @@ namespace AZ
AZ::JobCompletion jobCompletion;
const int numThreads = 8;
- const int numPixelsPerThread = buffer->size() / numChannels / numThreads;
+ const int numPixelsPerThread = static_cast(buffer->size() / numChannels / numThreads);
for (int i = 0; i < numThreads; ++i)
{
int startPixel = i * numPixelsPerThread;
diff --git a/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp
index 71f17b3361..0f8a30d8aa 100644
--- a/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/MorphTargets/MorphTargetDispatchItem.cpp
@@ -162,7 +162,7 @@ namespace AZ
m_rootConstantData.SetConstant(colorOffsetIndex, m_morphInstanceMetaData.m_accumulatedColorDeltaOffsetInBytes / 4);
}
- m_dispatchItem.m_rootConstantSize = m_rootConstantData.GetConstantData().size();
+ m_dispatchItem.m_rootConstantSize = static_cast(m_rootConstantData.GetConstantData().size());
m_dispatchItem.m_rootConstants = m_rootConstantData.GetConstantData().data();
}
diff --git a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
index 03ee176fd0..5a25951163 100644
--- a/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/Shadows/ProjectedShadowFeatureProcessor.cpp
@@ -497,7 +497,7 @@ namespace AZ::Render
const ShadowmapAtlas& atlas = m_projectedShadowmapsPasses.front()->GetShadowmapAtlas();
const Data::Instance indexTableBuffer = atlas.CreateShadowmapIndexTableBuffer(indexTableBufferName);
- m_filterParamBufferHandler.UpdateBuffer(m_shadowData.GetRawData(), m_shadowData.GetSize());
+ m_filterParamBufferHandler.UpdateBuffer(m_shadowData.GetRawData(), static_cast(m_shadowData.GetSize()));
// Set index table buffer and ESM parameter buffer to ESM pass.
for (EsmShadowmapsPass* esmPass : m_esmShadowmapsPasses)
@@ -564,7 +564,7 @@ namespace AZ::Render
if (m_deviceBufferNeedsUpdate)
{
- m_shadowBufferHandler.UpdateBuffer(m_shadowData.GetRawData(), m_shadowData.GetSize());
+ m_shadowBufferHandler.UpdateBuffer(m_shadowData.GetRawData(), static_cast(m_shadowData.GetSize()));
m_deviceBufferNeedsUpdate = false;
}
}
diff --git a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
index de2c52d1c8..af427eb554 100644
--- a/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
+++ b/Gems/Atom/Feature/Common/Code/Source/SkinnedMesh/SkinnedMeshInputBuffers.cpp
@@ -446,7 +446,7 @@ namespace AZ
// Positions start at the beginning of the allocation
instanceMetaData.m_accumulatedPositionDeltaOffsetInBytes = allocation->GetVirtualAddress().m_ptr;
- uint32_t deltaStreamSizeInBytes = vertexCount * MorphTargetConstants::s_unpackedMorphTargetDeltaSizeInBytes;
+ uint32_t deltaStreamSizeInBytes = static_cast(vertexCount * MorphTargetConstants::s_unpackedMorphTargetDeltaSizeInBytes);
// Followed by normals, tangents, and bitangents
instanceMetaData.m_accumulatedNormalDeltaOffsetInBytes = instanceMetaData.m_accumulatedPositionDeltaOffsetInBytes + deltaStreamSizeInBytes;
diff --git a/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp b/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp
index 0a31fe4c9e..e3f3ea906b 100644
--- a/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp
+++ b/Gems/Atom/Feature/Common/Code/Tests/SparseVectorTests.cpp
@@ -81,7 +81,7 @@ namespace UnitTest
EXPECT_EQ(data.c, TestData::DefaultValueC);
// Assign new unique values
- data.a = TestData::DefaultValueA * i;
+ data.a = TestData::DefaultValueA * static_cast(i);
data.b = TestData::DefaultValueB * float(i);
data.c = i % 2 == 0;
}
@@ -190,12 +190,12 @@ namespace UnitTest
EXPECT_EQ(data.b, TestData::DefaultValueB);
EXPECT_EQ(data.c, TestData::DefaultValueC);
- data.a = TestData::DefaultValueA * i;
+ data.a = TestData::DefaultValueA * static_cast(i);
data.b = TestData::DefaultValueB * float(i);
data.c = i % 2 == 0;
// Assign some values to the uninitialized primitive types
- container.GetElement<1>(indices[i]) = i * 10;
+ container.GetElement<1>(indices[i]) = static_cast(i * 10);
container.GetElement<2>(indices[i]) = i * 20.0f;
}
@@ -254,7 +254,7 @@ namespace UnitTest
{
indices[i] = container.Reserve();
- container.GetElement<1>(i) = i * 10;
+ container.GetElement<1>(i) = static_cast(i * 10);
container.GetElement<2>(i) = i * 20.0f;
}
diff --git a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
index 7461a7c3e8..a9e08249c4 100644
--- a/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
+++ b/Gems/Atom/RHI/Code/Source/RHI/ShaderResourceGroupData.cpp
@@ -139,7 +139,7 @@ namespace AZ
bool isValidAll = true;
for (size_t i = 0; i < imageViews.size(); ++i)
{
- const bool isValid = ValidateImageViewAccess(inputIndex, imageViews[i], i);
+ const bool isValid = ValidateImageViewAccess(inputIndex, imageViews[i], static_cast(i));
if (isValid)
{
m_imageViewsUnboundedArray.push_back(imageViews[i]);
@@ -185,7 +185,7 @@ namespace AZ
bool isValidAll = true;
for (size_t i = 0; i < bufferViews.size(); ++i)
{
- const bool isValid = ValidateBufferViewAccess(inputIndex, bufferViews[i], i);
+ const bool isValid = ValidateBufferViewAccess(inputIndex, bufferViews[i], static_cast(i));
if (isValid)
{
m_bufferViewsUnboundedArray.push_back(bufferViews[i]);
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
index 7437c3b339..d51fdd3495 100644
--- a/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
+++ b/Gems/Atom/RHI/DX12/Code/Source/RHI/ShaderResourceGroupPool.cpp
@@ -356,7 +356,7 @@ namespace AZ
if (!bufferViews.empty())
{
- group.m_unboundedDescriptorTables[tableIndex] = m_descriptorContext->CreateDescriptorTable(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, bufferViews.size());
+ group.m_unboundedDescriptorTables[tableIndex] = m_descriptorContext->CreateDescriptorTable(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, static_cast(bufferViews.size()));
AZ_Assert(group.m_unboundedDescriptorTables[tableIndex].IsValid(), "Descriptor context failed to allocate unbounded array descriptor table, most likely out of memory.");
ShaderResourceGroupCompiledData& compiledData = group.m_compiledData[group.m_compiledDataIndex];
@@ -415,7 +415,7 @@ namespace AZ
if (!imageViews.empty())
{
- group.m_unboundedDescriptorTables[tableIndex] = m_descriptorContext->CreateDescriptorTable(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, imageViews.size());
+ group.m_unboundedDescriptorTables[tableIndex] = m_descriptorContext->CreateDescriptorTable(D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, static_cast(imageViews.size()));
AZ_Assert(group.m_unboundedDescriptorTables[tableIndex].IsValid(), "Descriptor context failed to allocate unbounded array descriptor table, most likely out of memory.");
ShaderResourceGroupCompiledData& compiledData = group.m_compiledData[group.m_compiledDataIndex];
diff --git a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
index b4c153a38c..33623f93e4 100644
--- a/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
+++ b/Gems/Atom/RHI/Vulkan/Code/Source/RHI/RayTracingPipelineState.cpp
@@ -163,9 +163,9 @@ namespace AZ
createInfo.sType = VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR;
createInfo.pNext = nullptr;
createInfo.flags = 0;
- createInfo.stageCount = stages.size();
+ createInfo.stageCount = static_cast(stages.size());
createInfo.pStages = stages.data();
- createInfo.groupCount = groups.size();
+ createInfo.groupCount = static_cast(groups.size());
createInfo.pGroups = groups.data();
createInfo.maxPipelineRayRecursionDepth = descriptor->GetConfiguration().m_maxRecursionDepth;
createInfo.layout = m_pipelineLayout;
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
index 76e427a708..fb8708fb88 100644
--- a/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Builders/Model/ModelAssetBuilderComponent.cpp
@@ -882,7 +882,7 @@ namespace AZ
processedMorphTargets = true;
}
- totalVertexCount += vertexCount;
+ totalVertexCount += static_cast(vertexCount);
productMeshList.emplace_back(productMesh);
}
}
@@ -960,7 +960,7 @@ namespace AZ
for (const auto& skinData : sourceMesh.m_skinData)
{
const size_t numJoints = skinData->GetBoneCount();
- const AZ::u32 controlPointIndex = sourceMeshData->GetControlPointIndex(vertexIndex);
+ const AZ::u32 controlPointIndex = sourceMeshData->GetControlPointIndex(static_cast(vertexIndex));
const size_t numSkinInfluences = skinData->GetLinkCount(controlPointIndex);
size_t numInfluencesExcess = 0;
@@ -1195,15 +1195,15 @@ namespace AZ
mesh.m_skinWeights.size(), m_numSkinJointInfluencesPerVertex, m_numSkinJointInfluencesPerVertex);
const size_t numSkinInfluences = mesh.m_skinWeights.size();
- uint32_t jointIndicesSizeInBytes = numSkinInfluences * sizeof(uint16_t);
+ uint32_t jointIndicesSizeInBytes = static_cast(numSkinInfluences * sizeof(uint16_t));
meshView.m_skinJointIndicesView = RHI::BufferViewDescriptor::CreateRaw(0, jointIndicesSizeInBytes);
- meshView.m_skinWeightsView = RHI::BufferViewDescriptor::CreateTyped(0, numSkinInfluences, SkinWeightFormat);
+ meshView.m_skinWeightsView = RHI::BufferViewDescriptor::CreateTyped(0, static_cast(numSkinInfluences), SkinWeightFormat);
}
if (!mesh.m_morphTargetVertexData.empty())
{
const size_t numTotalVertices = mesh.m_morphTargetVertexData.size();
- meshView.m_morphTargetVertexDataView = RHI::BufferViewDescriptor::CreateStructured(0, numTotalVertices, sizeof(PackedCompressedMorphTargetDelta));
+ meshView.m_morphTargetVertexDataView = RHI::BufferViewDescriptor::CreateStructured(0, static_cast(numTotalVertices), sizeof(PackedCompressedMorphTargetDelta));
}
if (!mesh.m_clothData.empty())
@@ -1358,8 +1358,8 @@ namespace AZ
const size_t numPrevSkinInfluences = lodBufferInfo.m_skinInfluencesCount;
const size_t numNewSkinInfluences = mesh.m_skinWeights.size();
- meshView.m_skinJointIndicesView = RHI::BufferViewDescriptor::CreateRaw(/*byteOffset=*/numPrevSkinInfluences * sizeof(uint16_t), numNewSkinInfluences * sizeof(uint16_t));
- meshView.m_skinWeightsView = RHI::BufferViewDescriptor::CreateTyped(/*elementOffset=*/numPrevSkinInfluences, numNewSkinInfluences, SkinWeightFormat);
+ meshView.m_skinJointIndicesView = RHI::BufferViewDescriptor::CreateRaw(/*byteOffset=*/ static_cast(numPrevSkinInfluences * sizeof(uint16_t)), static_cast