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

Code compiles

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
monroegm-disable-blank-issue-2
Esteban Papp 4 years ago
parent 5f7b534afd
commit 1f5dddcca6
11 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
Code/Editor/Controls/SplineCtrlEx.cpp
Unescape Escape View File

@ -1856,7 +1856,7 @@ AbstractSplineWidget::EHitCode AbstractSplineWidget::HitTest(const QPoint& point
// Check tangent handles first.
{
QPoint incomingHandlePt, outgoingHandlePt, pt;
if (GetTangentHandlePts(incomingHandlePt, pt, outgoingHandlePt, splineIndex, i, nCurrentDimension))
if (GetTangentHandlePts(incomingHandlePt, pt, outgoingHandlePt, static_cast<int>(splineIndex), static_cast<int>(i), nCurrentDimension))
{
// For the incoming handle
if (abs(incomingHandlePt.x() - point.x()) < 4 && abs(incomingHandlePt.y() - point.y()) < 4)

2
Code/Editor/CryEdit.cpp
Unescape Escape View File

@ -3922,7 +3922,7 @@ void CCryEditApp::OpenLUAEditor(const char* files)
void CCryEditApp::PrintAlways(const AZStd::string& output)
{
m_stdoutRedirection.WriteBypassingRedirect(output.c_str(), output.size());
m_stdoutRedirection.WriteBypassingRedirect(output.c_str(), static_cast<unsigned int>(output.size()));
}
QString CCryEditApp::GetRootEnginePath() const

2
Code/Editor/EditorViewportWidget.cpp
Unescape Escape View File

@ -1899,7 +1899,7 @@ void EditorViewportWidget::RenderSelectedRegion()
// Draw volume
dc.DepthWriteOff();
dc.CullOff();
dc.pRenderAuxGeom->DrawTriangles(&verts[0], verts.size(), &inds[0], numInds, &colors[0]);
dc.pRenderAuxGeom->DrawTriangles(&verts[0], static_cast<uint32>(verts.size()), &inds[0], numInds, &colors[0]);
dc.CullOn();
dc.DepthWriteOn();
}

4
Code/Editor/Objects/EntityObject.cpp
Unescape Escape View File

@ -1540,7 +1540,7 @@ void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
if (m_eventTargets[i].target == target)
{
RemoveEventTarget(i);
numTargets = m_eventTargets.size();
numTargets = static_cast<int>(m_eventTargets.size());
i--;
}
}
@ -1553,7 +1553,7 @@ void CEntityObject::OnObjectEvent(CBaseObject* target, int event)
if (m_links[i].target == target)
{
RemoveEntityLink(i);
numTargets = m_eventTargets.size();
numTargets = static_cast<int>(m_eventTargets.size());
i--;
}
}

4
Code/Editor/TrackView/TrackViewAnimNode.cpp
Unescape Escape View File

@ -1477,7 +1477,7 @@ bool CTrackViewAnimNode::PasteNodesFromClipboard(QWidget* context)
AZStd::map<int, IAnimNode*> copiedIdToNodeMap;
const unsigned int numNodes = animNodesRoot->getChildCount();
for (int i = 0; i < numNodes; ++i)
for (unsigned int i = 0; i < numNodes; ++i)
{
XmlNodeRef xmlNode = animNodesRoot->getChild(i);
@ -2123,7 +2123,7 @@ bool CTrackViewAnimNode::ContainsComponentWithId(AZ::ComponentId componentId) co
if (GetType() == AnimNodeType::AzEntity)
{
// search for a matching componentId on all children
for (int i = 0; i < GetChildCount(); i++)
for (unsigned int i = 0; i < GetChildCount(); i++)
{
CTrackViewNode* childNode = GetChild(i);
if (childNode->GetNodeType() == eTVNT_AnimNode)

4
Code/Editor/TrackView/TrackViewDialog.cpp
Unescape Escape View File

@ -1991,7 +1991,7 @@ void CTrackViewDialog::UpdateTracksToolBar()
&Maestro::EditorSequenceComponentRequestBus::Events::GetAllAnimatablePropertiesForComponent,
animatableProperties, azEntityId, pAnimNode->GetComponentId());
paramCount = animatableProperties.size();
paramCount = static_cast<int>(animatableProperties.size());
}
}
else
@ -2317,7 +2317,7 @@ void CTrackViewDialog::SaveCurrentSequenceToFBX()
CTrackViewTrackBundle allTracks = sequence->GetAllTracks();
for (int trackID = 0; trackID < allTracks.GetCount(); ++trackID)
for (unsigned int trackID = 0; trackID < allTracks.GetCount(); ++trackID)
{
CTrackViewTrack* pCurrentTrack = allTracks.GetTrack(trackID);

22
Code/Editor/TrackView/TrackViewDopeSheetBase.cpp
Unescape Escape View File

@ -1556,7 +1556,7 @@ void CTrackViewDopeSheetBase::MouseMoveMove(const QPoint& p, [[maybe_unused]] Qt
const TrackMemento& trackMemento = iter->second;
pTrack->RestoreFromMemento(trackMemento.m_memento);
const unsigned int numKeys = trackMemento.m_keySelectionStates.size();
const unsigned int numKeys = static_cast<unsigned int>(trackMemento.m_keySelectionStates.size());
for (unsigned int i = 0; i < numKeys; ++i)
{
pTrack->GetKey(i).Select(trackMemento.m_keySelectionStates[i]);
@ -1946,7 +1946,7 @@ void CTrackViewDopeSheetBase::ChangeSequenceTrackSelection(CTrackViewSequence* s
CTrackViewTrackBundle prevSelectedTracks;
prevSelectedTracks = sequenceWithTrack->GetSelectedTracks();
for (int i = 0; i < prevSelectedTracks.GetCount(); i++)
for (unsigned int i = 0; i < prevSelectedTracks.GetCount(); i++)
{
CTrackViewTrack* prevSelectedTrack = prevSelectedTracks.GetTrack(i);
if (prevSelectedTrack != trackToSelect)
@ -2023,7 +2023,7 @@ bool CTrackViewDopeSheetBase::CreateColorKey(CTrackViewTrack* pTrack, float keyT
AzToolsFramework::ScopedUndoBatch undoBatch("Set Key");
const unsigned int numChildNodes = pTrack->GetChildCount();
for (int i = 0; i < numChildNodes; ++i)
for (unsigned int i = 0; i < numChildNodes; ++i)
{
CTrackViewTrack* subTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
if (IsOkToAddKeyHere(subTrack, keyTime))
@ -2083,7 +2083,7 @@ void CTrackViewDopeSheetBase::UpdateColorKey(const QColor& color, bool addToUndo
void CTrackViewDopeSheetBase::UpdateColorKeyHelper(const ColorF& color)
{
const unsigned int numChildNodes = m_colorUpdateTrack->GetChildCount();
for (int i = 0; i < numChildNodes; ++i)
for (unsigned int i = 0; i < numChildNodes; ++i)
{
CTrackViewTrack* subTrack = static_cast<CTrackViewTrack*>(m_colorUpdateTrack->GetChild(i));
CTrackViewKeyHandle subTrackKey = subTrack->GetKeyByTime(m_colorUpdateKeyTime);
@ -2258,7 +2258,7 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
}
else // A compound track
{
for (int k = 0; k < pCurrTrack->GetChildCount(); ++k)
for (unsigned int k = 0; k < pCurrTrack->GetChildCount(); ++k)
{
CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pCurrTrack->GetChild(k));
if (IsOkToAddKeyHere(pSubTrack, keyTime))
@ -2293,7 +2293,7 @@ void CTrackViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKey
else
{
AzToolsFramework::ScopedUndoBatch undoBatch("Create Key");
for (int i = 0; i < pTrack->GetChildCount(); ++i)
for (unsigned int i = 0; i < pTrack->GetChildCount(); ++i)
{
CTrackViewTrack* pSubTrack = static_cast<CTrackViewTrack*>(pTrack->GetChild(i));
if (IsOkToAddKeyHere(pSubTrack, keyTime))
@ -3094,7 +3094,7 @@ void CTrackViewDopeSheetBase::SelectKeys(const QRect& rc, const bool bMultiSelec
// note the tracks to select for the keyHandles selected
CTrackViewTrackBundle tracksToSelect;
for (int i = 0; i < tracks.GetCount(); ++i)
for (unsigned int i = 0; i < tracks.GetCount(); ++i)
{
CTrackViewTrack* pTrack = tracks.GetTrack(i);
@ -3108,7 +3108,7 @@ void CTrackViewDopeSheetBase::SelectKeys(const QRect& rc, const bool bMultiSelec
(rc.bottom() >= trackRect.top() && rc.bottom() <= trackRect.bottom()))
{
// 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);
@ -3175,7 +3175,7 @@ void CTrackViewDopeSheetBase::DrawSelectedKeyIndicators(QPainter* painter)
painter->setPen(Qt::green);
CTrackViewKeyBundle keys = pSequence->GetSelectedKeys();
for (int i = 0; i < keys.GetKeyCount(); ++i)
for (unsigned int i = 0; i < keys.GetKeyCount(); ++i)
{
const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
int x = TimeToClient(keyHandle.GetTime());
@ -3423,7 +3423,7 @@ void CTrackViewDopeSheetBase::DrawSummary(QPainter* painter, const QRect& rcUpda
// Draw a short thick line at each place where there is a key in any tracks.
CTrackViewKeyBundle keys = pSequence->GetAllKeys();
for (int i = 0; i < keys.GetKeyCount(); ++i)
for (unsigned int i = 0; i < keys.GetKeyCount(); ++i)
{
const CTrackViewKeyHandle& keyHandle = keys.GetKey(i);
int x = TimeToClient(keyHandle.GetTime());
@ -3635,7 +3635,7 @@ void CTrackViewDopeSheetBase::StoreMementoForTracksWithSelectedKeys()
std::set<CTrackViewTrack*> tracks;
const unsigned int numKeys = selectedKeys.GetKeyCount();
for (int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
for (unsigned int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
{
CTrackViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
tracks.insert(keyHandle.GetTrack());

6
Code/Editor/TrackView/TrackViewNodes.cpp
Unescape Escape View File

@ -1765,7 +1765,7 @@ void CTrackViewNodesCtrl::ImportFromFBX()
pSpline->SetKeyInTangent(keyIndex, inTangent);
}
if (keyIndex < (pTrack->GetKeyCount() - 1))
if (keyIndex < static_cast<int>(pTrack->GetKeyCount() - 1))
{
CTrackViewKeyHandle nextKey = key.GetNextKey();
if (nextKey.IsValid())
@ -2352,7 +2352,7 @@ bool CTrackViewNodesCtrl::FillAddTrackMenu(STrackMenuTreeNode& menuAddTrack, con
QStringList splittedName = name.split("/", Qt::SkipEmptyParts);
STrackMenuTreeNode* pCurrentNode = &menuAddTrack;
for (unsigned int j = 0; j < splittedName.size() - 1; ++j)
for (int j = 0; j < splittedName.size() - 1; ++j)
{
const QString& segment = splittedName[j];
auto findIter = pCurrentNode->children.find(segment);
@ -2652,7 +2652,7 @@ void CTrackViewNodesCtrl::CreateSetAnimationLayerPopupMenu(QMenu& menuSetLayer,
CTrackViewTrackBundle animationTracks = pTrack->GetAnimNode()->GetTracksByParam(AnimParamType::Animation);
const unsigned int numAnimationTracks = animationTracks.GetCount();
for (int i = 0; i < numAnimationTracks; ++i)
for (unsigned int i = 0; i < numAnimationTracks; ++i)
{
CTrackViewTrack* pAnimationTrack = animationTracks.GetTrack(i);
if (pAnimationTrack)

6
Code/Editor/TrackView/TrackViewSequence.cpp
Unescape Escape View File

@ -1403,7 +1403,7 @@ float CTrackViewSequence::ClipTimeOffsetForSliding(const float timeOffset)
for (pTrackIter = tracks.begin(); pTrackIter != tracks.end(); ++pTrackIter)
{
CTrackViewTrack* pTrack = *pTrackIter;
for (int i = 0; i < pTrack->GetKeyCount(); ++i)
for (unsigned int i = 0; i < pTrack->GetKeyCount(); ++i)
{
const CTrackViewKeyHandle& keyHandle = pTrack->GetKey(i);
@ -1486,7 +1486,7 @@ void CTrackViewSequence::CloneSelectedKeys()
std::vector<float> selectedKeyTimes;
for (size_t k = 0; k < selectedKeys.GetKeyCount(); ++k)
{
CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
CTrackViewKeyHandle skey = selectedKeys.GetKey(static_cast<unsigned int>(k));
if (pTrack != skey.GetTrack())
{
pTrack = skey.GetTrack();
@ -1498,7 +1498,7 @@ void CTrackViewSequence::CloneSelectedKeys()
// Now, do the actual cloning.
for (size_t k = 0; k < selectedKeyTimes.size(); ++k)
{
CTrackViewKeyHandle skey = selectedKeys.GetKey(k);
CTrackViewKeyHandle skey = selectedKeys.GetKey(static_cast<unsigned int>(k));
skey = skey.GetTrack()->GetKeyByTime(selectedKeyTimes[k]);
assert(skey.IsValid());

2
Code/Editor/Util/MemoryBlock.cpp
Unescape Escape View File

@ -175,7 +175,7 @@ void CMemoryBlock::Uncompress(CMemoryBlock& toBlock) const
#endif
uncompress((unsigned char*)toBlock.GetBuffer(), &destSize, (unsigned char*)GetBuffer(), GetSize());
assert(result == Z_OK);
assert(destSize == m_uncompressedSize);
assert(destSize == static_cast<unsigned long>(m_uncompressedSize));
}
//////////////////////////////////////////////////////////////////////////

18
Gems/LyShine/Code/Editor/Animation/UiAnimViewDopeSheetBase.cpp
Unescape Escape View File

@ -1632,7 +1632,7 @@ float CUiAnimViewDopeSheetBase::MagnetSnap(float newTime, const CUiAnimViewAnimN
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)
{
CUiAnimViewKeyHandle keyHandle = keys.GetKey(i);
if (keyHandle.GetTrack()->GetAnimNode() == pNode)
@ -1770,7 +1770,7 @@ bool CUiAnimViewDopeSheetBase::CreateColorKey(CUiAnimViewTrack* pTrack, float ke
CUiAnimViewSequenceNotificationContext context(pTrack->GetSequence());
const unsigned int numChildNodes = pTrack->GetChildCount();
for (int i = 0; i < numChildNodes; ++i)
for (unsigned int i = 0; i < numChildNodes; ++i)
{
CUiAnimViewTrack* subTrack = static_cast<CUiAnimViewTrack*>(pTrack->GetChild(i));
if (IsOkToAddKeyHere(subTrack, keyTime))
@ -1890,7 +1890,7 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe
}
else // A compound track
{
for (int k = 0; k < pCurrTrack->GetChildCount(); ++k)
for (unsigned int k = 0; k < pCurrTrack->GetChildCount(); ++k)
{
CUiAnimViewTrack* pSubTrack = static_cast<CUiAnimViewTrack*>(pCurrTrack->GetChild(k));
if (IsOkToAddKeyHere(pSubTrack, keyTime))
@ -1921,7 +1921,7 @@ void CUiAnimViewDopeSheetBase::AddKeys(const QPoint& point, const bool bTryAddKe
else
{
RecordTrackUndo(pTrack);
for (int i = 0; i < pTrack->GetChildCount(); ++i)
for (unsigned int i = 0; i < pTrack->GetChildCount(); ++i)
{
CUiAnimViewTrack* pSubTrack = static_cast<CUiAnimViewTrack*>(pTrack->GetChild(i));
if (IsOkToAddKeyHere(pSubTrack, keyTime))
@ -2619,7 +2619,7 @@ void CUiAnimViewDopeSheetBase::SelectKeys(const QRect& rc, const bool bMultiSele
CUiAnimViewTrackBundle tracks = pSequence->GetAllTracks();
for (int i = 0; i < tracks.GetCount(); ++i)
for (unsigned int i = 0; i < tracks.GetCount(); ++i)
{
CUiAnimViewTrack* pTrack = tracks.GetTrack(i);
@ -2633,7 +2633,7 @@ void CUiAnimViewDopeSheetBase::SelectKeys(const QRect& rc, const bool bMultiSele
(rc.bottom() >= trackRect.top() && rc.bottom() <= trackRect.bottom()))
{
// Check which keys we intersect.
for (int j = 0; j < pTrack->GetKeyCount(); j++)
for (unsigned int j = 0; j < pTrack->GetKeyCount(); j++)
{
CUiAnimViewKeyHandle keyHandle = pTrack->GetKey(j);
@ -2700,7 +2700,7 @@ void CUiAnimViewDopeSheetBase::DrawSelectedKeyIndicators(QPainter* painter)
painter->setPen(Qt::green);
CUiAnimViewKeyBundle keys = pSequence->GetSelectedKeys();
for (int i = 0; i < keys.GetKeyCount(); ++i)
for (unsigned int i = 0; i < keys.GetKeyCount(); ++i)
{
CUiAnimViewKeyHandle keyHandle = keys.GetKey(i);
int x = TimeToClient(keyHandle.GetTime());
@ -2951,7 +2951,7 @@ void CUiAnimViewDopeSheetBase::DrawSummary(QPainter* painter, const QRect& rcUpd
// Draw a short thick line at each place where there is a key in any tracks.
CUiAnimViewKeyBundle keys = pSequence->GetAllKeys();
for (int i = 0; i < keys.GetKeyCount(); ++i)
for (unsigned int i = 0; i < keys.GetKeyCount(); ++i)
{
CUiAnimViewKeyHandle keyHandle = keys.GetKey(i);
int x = TimeToClient(keyHandle.GetTime());
@ -3112,7 +3112,7 @@ void CUiAnimViewDopeSheetBase::StoreMementoForTracksWithSelectedKeys()
std::set<CUiAnimViewTrack*> tracks;
const unsigned int numKeys = selectedKeys.GetKeyCount();
for (int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
for (unsigned int keyIndex = 0; keyIndex < numKeys; ++keyIndex)
{
CUiAnimViewKeyHandle keyHandle = selectedKeys.GetKey(keyIndex);
tracks.insert(keyHandle.GetTrack());

Write Preview
Loading…
Cancel
Save