birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More fixes for Code/Editor

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-13 16:05:20 -07:00
parent 1d4c53a777
commit 5f7b534afd
66 changed files with 185 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Editor/TrackView/CommentKeyUIControls.cpp
+1 -1
View File
@@ -122,7 +122,7 @@ void CCommentKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle& sel
for (size_t keyIndex = 0, num = selectedKeys.GetKeyCount(); keyIndex < num; keyIndex++)
{
CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(static_cast<unsigned int>(keyIndex));
CAnimParamType paramType = keyHandle.GetTrack()->GetParameterType();
if (paramType == AnimParamType::CommentText)
Code/Editor/TrackView/ScreenFaderKeyUIControls.cpp
+1 -1
View File
@@ -128,7 +128,7 @@ void CScreenFaderKeyUIControls::OnUIChange(IVariable* pVar, CTrackViewKeyBundle&
for (size_t keyIndex = 0, num = selectedKeys.GetKeyCount(); keyIndex < num; ++keyIndex)
{
CTrackViewKeyHandle selectedKey = selectedKeys.GetKey(keyIndex);
CTrackViewKeyHandle selectedKey = selectedKeys.GetKey(static_cast<unsigned int>(keyIndex));
CAnimParamType paramType = selectedKey.GetTrack()->GetParameterType();
if (paramType == AnimParamType::ScreenFader)
Code/Editor/TrackView/SequenceBatchRenderDialog.cpp
+3 -3
View File
@@ -357,7 +357,7 @@ void CSequenceBatchRenderDialog::OnRenderItemSelChange()
QString cvarsText;
for (size_t i = 0; i < item.cvars.size(); ++i)
{
cvarsText += item.cvars[i];
cvarsText += item.cvars[static_cast<int>(i)];
cvarsText += "\r\n";
}
m_ui->m_cvarsEdit->setPlainText(cvarsText);
@@ -894,7 +894,7 @@ void CSequenceBatchRenderDialog::CaptureItemStart()
// Set up the custom config cvars for this item.
for (size_t i = 0; i < renderItem.cvars.size(); ++i)
{
GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(renderItem.cvars[i].toUtf8().data());
GetIEditor()->GetSystem()->GetIConsole()->ExecuteString(renderItem.cvars[static_cast<int>(i)].toUtf8().data());
}
// Set specific capture options for this item.
@@ -1519,7 +1519,7 @@ void CSequenceBatchRenderDialog::OnSaveBatch()
// cvars
for (size_t k = 0; k < item.cvars.size(); ++k)
{
itemNode->newChild("cvar")->setContent(item.cvars[k].toUtf8().data());
itemNode->newChild("cvar")->setContent(item.cvars[static_cast<int>(k)].toUtf8().data());
}
}
Code/Editor/TrackView/SequenceKeyUIControls.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ bool CSequenceKeyUIControls::OnKeySelectionChange(CTrackViewKeyBundle& selectedK
mv_sequence->AddEnumItem(QObject::tr("<None>"), CTrackViewDialog::GetEntityIdAsString(AZ::EntityId(AZ::EntityId::InvalidEntityId)));
const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
for (int i = 0; i < pSequenceManager->GetCount(); ++i)
for (unsigned int i = 0; i < pSequenceManager->GetCount(); ++i)
{
CTrackViewSequence* pCurrentSequence = pSequenceManager->GetSequenceByIndex(i);
bool bNotMe = pCurrentSequence != pSequence;
Code/Editor/TrackView/TVEventsDialog.cpp
+1 -1
View File
@@ -363,7 +363,7 @@ int TVEventsModel::GetNumberOfUsageAndFirstTimeUsed(const char* eventName, float
{
CTrackViewTrack* pTrack = tracks.GetTrack(currentTrack);
for (int currentKey = 0; currentKey < pTrack->GetKeyCount(); ++currentKey)
for (unsigned int currentKey = 0; currentKey < pTrack->GetKeyCount(); ++currentKey)
{
CTrackViewKeyHandle keyHandle = pTrack->GetKey(currentKey);
Code/Editor/TrackView/TrackViewAnimNode.cpp
+1 -1
View File
@@ -452,7 +452,7 @@ CTrackViewAnimNode* CTrackViewAnimNode::CreateSubNode(
{
// Check for a duplicates
CTrackViewAnimNodeBundle azEntityNodesFound = director2->GetAnimNodesByType(AnimNodeType::AzEntity);
for (int x = 0; x < azEntityNodesFound.GetCount(); x++)
for (unsigned int x = 0; x < azEntityNodesFound.GetCount(); x++)
{
if (azEntityNodesFound.GetNode(x)->GetAzEntityId() == owner)
{
Code/Editor/TrackView/TrackViewCurveEditor.cpp
+1 -1
View File
@@ -145,7 +145,7 @@ void CTrackViewCurveEditor::UpdateSplines()
std::set<CTrackViewTrack*> newTracks;
if (selectedTracks.AreAllOfSameType())
{
for (int i = 0; i < selectedTracks.GetCount(); i++)
for (unsigned int i = 0; i < selectedTracks.GetCount(); i++)
{
CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
Code/Editor/TrackView/TrackViewDialog.cpp
+3 -3
View File
@@ -782,7 +782,7 @@ void CTrackViewDialog::UpdateActions()
}
bool allSelectedTracksUseMute = true;
for (int i = 0; i < selectedTrackCount; i++)
for (unsigned int i = 0; i < selectedTrackCount; i++)
{
CTrackViewTrack* pTrack = selectedTracks.GetTrack(i);
if (pTrack && !pTrack->UsesMute())
@@ -1121,7 +1121,7 @@ void CTrackViewDialog::ReloadSequencesComboBox()
CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
const unsigned int numSequences = pSequenceManager->GetCount();
for (int k = 0; k < numSequences; ++k)
for (unsigned int k = 0; k < numSequences; ++k)
{
CTrackViewSequence* sequence = pSequenceManager->GetSequenceByIndex(k);
QString entityIdString = GetEntityIdAsString(sequence->GetSequenceComponentEntityId());
@@ -1799,7 +1799,7 @@ void CTrackViewDialog::SaveMiscSettings() const
settings.setValue(s_kFrameSnappingFPSEntry, fps);
settings.setValue(s_kTickDisplayModeEntry, static_cast<int>(m_wndDopeSheet->GetTickDisplayMode()));
settings.setValue(s_kDefaultTracksEntry, QByteArray(reinterpret_cast<const char*>(m_defaultTracksForEntityNode.data()),
m_defaultTracksForEntityNode.size() * sizeof(AnimParamType)));
static_cast<int>(m_defaultTracksForEntityNode.size() * sizeof(AnimParamType))));
}
//////////////////////////////////////////////////////////////////////////
Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
+4 -4
View File
@@ -1028,12 +1028,12 @@ void CTrackViewDopeSheetBase::SelectAllKeysWithinTimeFrame(const QRect& rc, cons
CTrackViewTrackBundle tracks = sequence->GetAllTracks();
CTrackViewSequenceNotificationContext context(sequence);
for (int i = 0; i < tracks.GetCount(); ++i)
for (unsigned int i = 0; i < tracks.GetCount(); ++i)
{
CTrackViewTrack* pTrack = tracks.GetTrack(i);
// Check which keys we intersect.
for (int j = 0; j < pTrack->GetKeyCount(); j++)
for (unsigned int j = 0; j < pTrack->GetKeyCount(); j++)
{
CTrackViewKeyHandle keyHandle = pTrack->GetKey(j);
const float time = keyHandle.GetTime();
@@ -1429,7 +1429,7 @@ bool CTrackViewDopeSheetBase::IsOkToAddKeyHere(const CTrackViewTrack* pTrack, fl
{
const float timeEpsilon = 0.05f;
for (int i = 0; i < pTrack->GetKeyCount(); ++i)
for (unsigned int i = 0; i < pTrack->GetKeyCount(); ++i)
{
const CTrackViewKeyConstHandle& keyHandle = pTrack->GetKey(i);
@@ -1764,7 +1764,7 @@ float CTrackViewDopeSheetBase::MagnetSnap(float newTime, const CTrackViewAnimNod
newTime = keys.GetKey(0).GetTime();
// But if there is an in-range key in a sibling track, use it instead.
// Here a 'sibling' means a track that belongs to a same node.
for (int i = 0; i < keys.GetKeyCount(); ++i)
for (unsigned int i = 0; i < keys.GetKeyCount(); ++i)
{
CTrackViewKeyHandle keyHandle = keys.GetKey(i);
if (keyHandle.GetTrack()->GetAnimNode() == pNode)
Code/Editor/TrackView/TrackViewNode.cpp
+1 -1
View File
@@ -86,7 +86,7 @@ void CTrackViewKeyHandle::SetTime(float time, bool notifyListeners)
if (!m_pTrack->IsSortMarkerKey(m_keyIndex))
{
CTrackViewKeyBundle allKeys = m_pTrack->GetAllKeys();
for (int x = 0; x < allKeys.GetKeyCount(); x++)
for (unsigned int x = 0; x < allKeys.GetKeyCount(); x++)
{
unsigned int curIndex = allKeys.GetKey(x).GetIndex();
if (m_pTrack->IsSortMarkerKey(curIndex))
Code/Editor/TrackView/TrackViewNodes.cpp
+1 -1
View File
@@ -2306,7 +2306,7 @@ bool CTrackViewNodesCtrl::FillAddTrackMenu(STrackMenuTreeNode& menuAddTrack, con
&Maestro::EditorSequenceComponentRequestBus::Events::GetAllAnimatablePropertiesForComponent,
animatableProperties, azEntityId, animNode->GetComponentId());
paramCount = animatableProperties.size();
paramCount = static_cast<int>(animatableProperties.size());
}
}
else
Code/Editor/TrackView/TrackViewPythonFuncs.cpp
+2 -2
View File
@@ -113,7 +113,7 @@ namespace
AZStd::string PyTrackViewGetSequenceName(unsigned int index)
{
if (index < PyTrackViewGetNumSequences())
if (static_cast<int>(index) < PyTrackViewGetNumSequences())
{
const CTrackViewSequenceManager* pSequenceManager = GetIEditor()->GetSequenceManager();
return pSequenceManager->GetSequenceByIndex(index)->GetName();
@@ -378,7 +378,7 @@ namespace
}
CTrackViewAnimNodeBundle foundNodes = pParentDirector->GetAllAnimNodes();
if (index < 0 || index >= foundNodes.GetCount())
if (index < 0 || index >= static_cast<int>(foundNodes.GetCount()))
{
throw std::runtime_error("Invalid node index");
}
Code/Editor/TrackView/TrackViewSequence.cpp
+2 -2
View File
@@ -455,7 +455,7 @@ void CTrackViewSequence::OnNodeChanged(CTrackViewNode* node, ITrackViewSequenceL
// Make sure to deselect any keys
CTrackViewKeyBundle keys = node->GetAllKeys();
for (int key = 0; key < keys.GetKeyCount(); key++)
for (unsigned int key = 0; key < keys.GetKeyCount(); key++)
{
CTrackViewKeyHandle keyHandle = keys.GetKey(key);
if (keyHandle.IsSelected())
@@ -1249,7 +1249,7 @@ void CTrackViewSequence::DeselectAllKeys()
CTrackViewSequenceNotificationContext context(this);
CTrackViewKeyBundle selectedKeys = GetSelectedKeys();
for (int i = 0; i < selectedKeys.GetKeyCount(); ++i)
for (unsigned int i = 0; i < selectedKeys.GetKeyCount(); ++i)
{
CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(i);
keyHandle.Select(false);
Code/Editor/TrackView/TrackViewSequenceManager.cpp
+4 -4
View File
@@ -227,7 +227,7 @@ void CTrackViewSequenceManager::AddTrackViewSequence(CTrackViewSequence* sequenc
////////////////////////////////////////////////////////////////////////////
void CTrackViewSequenceManager::DeleteSequence(CTrackViewSequence* sequence)
{
const int numSequences = m_sequences.size();
const int numSequences = static_cast<int>(m_sequences.size());
for (int sequenceIndex = 0; sequenceIndex < numSequences; ++sequenceIndex)
{
if (m_sequences[sequenceIndex].get() == sequence)
@@ -246,7 +246,7 @@ void CTrackViewSequenceManager::DeleteSequence(CTrackViewSequence* sequence)
{
AZ::ComponentTypeList requiredComponents;
AzToolsFramework::EditorEntityContextRequestBus::BroadcastResult(requiredComponents, &AzToolsFramework::EditorEntityContextRequestBus::Events::GetRequiredComponentTypes);
const int numComponentToDeleteEntity = requiredComponents.size() + 1;
const int numComponentToDeleteEntity = static_cast<int>(requiredComponents.size() + 1);
AZ::Entity::ComponentArrayType entityComponents = entity->GetComponents();
if (entityComponents.size() == numComponentToDeleteEntity)
@@ -413,9 +413,9 @@ void CTrackViewSequenceManager::OnDataBaseItemEvent([[maybe_unused]] IDataBaseIt
{
if (event != EDataBaseItemEvent::EDB_ITEM_EVENT_ADD)
{
const uint numSequences = m_sequences.size();
const size_t numSequences = m_sequences.size();
for (uint i = 0; i < numSequences; ++i)
for (size_t i = 0; i < numSequences; ++i)
{
m_sequences[i]->UpdateDynamicParams();
}
Code/Editor/TrackView/TrackViewSplineCtrl.cpp
+3 -3
View File
@@ -706,7 +706,7 @@ void CTrackViewSplineCtrl::mouseMoveEvent(QMouseEvent* event)
QString tipText;
bool boFoundTheSelectedKey(false);
for (int splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
for (size_t splineIndex = 0, endSpline = m_splines.size(); splineIndex < endSpline; ++splineIndex)
{
ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
CTrackViewTrack* pTrack = m_tracks[splineIndex];
@@ -796,7 +796,7 @@ void CTrackViewSplineCtrl::AdjustTCB(float d_tension, float d_continuity, float
SendNotifyEvent(SPLN_BEFORE_CHANGE);
for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
for (size_t splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
{
ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
CTrackViewTrack* pTrack = m_tracks[splineIndex];
@@ -892,7 +892,7 @@ void CTrackViewSplineCtrl::OnUserCommand(UINT cmd)
bool CTrackViewSplineCtrl::IsUnifiedKeyCurrentlySelected() const
{
for (int splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
for (size_t splineIndex = 0, splineCount = m_splines.size(); splineIndex < splineCount; ++splineIndex)
{
ISplineInterpolator* pSpline = m_splines[splineIndex].pSpline;
Code/Editor/TrackView/TrackViewUndo.cpp
+1 -1
View File
@@ -70,7 +70,7 @@ CTrackViewTrack* CUndoComponentEntityTrackObject::FindTrack(CTrackViewSequence*
CTrackViewTrack* track = nullptr;
CTrackViewTrackBundle allTracks = sequence->GetAllTracks();
for (int trackIndex = 0; trackIndex < allTracks.GetCount(); trackIndex++)
for (unsigned int trackIndex = 0; trackIndex < allTracks.GetCount(); trackIndex++)
{
CTrackViewTrack* curTrack = allTracks.GetTrack(trackIndex);
if (curTrack->GetAnimNode() && curTrack->GetAnimNode()->GetComponentId() == m_trackComponentId)