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

Maestro

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
pappeste
2021-06-18 15:48:17 -07:00
committed by Esteban Papp
parent 3c56edb827
commit a66f9c0e59
15 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Maestro/Code/Source/Cinematics/AnimNode.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ void CAnimNode::Activate([[maybe_unused]] bool bActivate)
//////////////////////////////////////////////////////////////////////////
int CAnimNode::GetTrackCount() const
{
return m_tracks.size();
return static_cast<int>(m_tracks.size());
}
const char* CAnimNode::GetParamName(const CAnimParamType& paramType) const
Gems/Maestro/Code/Source/Cinematics/AnimPostFXNode.cpp
+1 -1
View File
@@ -288,7 +288,7 @@ void CAnimPostFXNode::SerializeAnims(XmlNodeRef& xmlNode, bool bLoading, bool bL
//-----------------------------------------------------------------------------
unsigned int CAnimPostFXNode::GetParamCount() const
{
return m_pDescription->m_nodeParams.size();
return static_cast<unsigned int>(m_pDescription->m_nodeParams.size());
}
//-----------------------------------------------------------------------------
Gems/Maestro/Code/Source/Cinematics/AnimScreenFaderNode.cpp
+3 -3
View File
@@ -114,7 +114,7 @@ void CAnimScreenFaderNode::Animate(SAnimContext& ac)
for (size_t nFaderTrackNo = 0; nFaderTrackNo < nScreenFaderTracksNumber; ++nFaderTrackNo)
{
CScreenFaderTrack* pTrack = static_cast<CScreenFaderTrack*>(GetTrackForParameter(AnimParamType::ScreenFader, nFaderTrackNo));
CScreenFaderTrack* pTrack = static_cast<CScreenFaderTrack*>(GetTrackForParameter(AnimParamType::ScreenFader, static_cast<uint32>(nFaderTrackNo)));
if (!pTrack)
{
@@ -298,7 +298,7 @@ void CAnimScreenFaderNode::Reflect(AZ::ReflectContext* context)
//-----------------------------------------------------------------------------
unsigned int CAnimScreenFaderNode::GetParamCount() const
{
return s_screenFaderNodeParams.size();
return static_cast<unsigned int>(s_screenFaderNodeParams.size());
}
//-----------------------------------------------------------------------------
@@ -350,7 +350,7 @@ bool CAnimScreenFaderNode::IsAnyTextureVisible() const
size_t const paramCount = m_tracks.size();
for (size_t paramIndex = 0; paramIndex < paramCount; ++paramIndex)
{
CScreenFaderTrack* pTrack = static_cast<CScreenFaderTrack*>(GetTrackForParameter(AnimParamType::ScreenFader, paramIndex));
CScreenFaderTrack* pTrack = static_cast<CScreenFaderTrack*>(GetTrackForParameter(AnimParamType::ScreenFader, static_cast<uint32>(paramIndex)));
if (!pTrack)
{
Gems/Maestro/Code/Source/Cinematics/AnimSequence.cpp
+2 -2
View File
@@ -66,7 +66,7 @@ CAnimSequence::CAnimSequence()
CAnimSequence::~CAnimSequence()
{
// clear reference to me from all my nodes
for (int i = m_nodes.size(); --i >= 0;)
for (int i = static_cast<int>(m_nodes.size()); --i >= 0;)
{
if (m_nodes[i])
{
@@ -181,7 +181,7 @@ const IAnimSequence* CAnimSequence::GetParentSequence() const
//////////////////////////////////////////////////////////////////////////
int CAnimSequence::GetNodeCount() const
{
return m_nodes.size();
return static_cast<int>(m_nodes.size());
}
//////////////////////////////////////////////////////////////////////////
Gems/Maestro/Code/Source/Cinematics/AnimTrack.h
+2 -2
View File
@@ -96,7 +96,7 @@ public:
}
//! Return number of keys in track.
virtual int GetNumKeys() const { return m_keys.size(); };
virtual int GetNumKeys() const { return static_cast<int>(m_keys.size()); };
//! Return true if keys exists in this track
virtual bool HasKeys() const { return !m_keys.empty(); }
@@ -575,7 +575,7 @@ inline int TAnimTrack<KeyType>::GetActiveKey(float time, KeyType* key)
return -1;
}
int nkeys = m_keys.size();
int nkeys = static_cast<int>(m_keys.size());
if (nkeys == 0)
{
m_lastTime = time;
Gems/Maestro/Code/Source/Cinematics/BoolTrack.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ void CBoolTrack::GetValue(float time, bool& value)
CheckValid();
int nkeys = m_keys.size();
int nkeys = static_cast<int>(m_keys.size());
if (nkeys < 1)
{
return;
Gems/Maestro/Code/Source/Cinematics/CommentNode.cpp
+1 -1
View File
@@ -114,7 +114,7 @@ void CCommentNode::Reflect(AZ::ReflectContext* context)
//-----------------------------------------------------------------------------
unsigned int CCommentNode::GetParamCount() const
{
return s_nodeParameters.size();
return static_cast<unsigned int>(s_nodeParameters.size());
}
//-----------------------------------------------------------------------------
Gems/Maestro/Code/Source/Cinematics/GotoTrack.cpp
+1 -1
View File
@@ -132,7 +132,7 @@ void CGotoTrack::SetKeyAtTime(float time, IKey* key)
if (fabs(keyt - time) < MIN_TIME_PRECISION)
{
key->flags = m_keys[i].flags; // Reserve the flag value.
SetKey(i, key);
SetKey(static_cast<int>(i), key);
found = true;
break;
}
Gems/Maestro/Code/Source/Cinematics/LayerNode.cpp
+1 -1
View File
@@ -138,7 +138,7 @@ void CLayerNode::Serialize(XmlNodeRef& xmlNode, bool bLoading, bool bLoadEmptyTr
//-----------------------------------------------------------------------------
unsigned int CLayerNode::GetParamCount() const
{
return s_nodeParams.size();
return static_cast<unsigned int>(s_nodeParams.size());
}
//-----------------------------------------------------------------------------
Gems/Maestro/Code/Source/Cinematics/MaterialNode.cpp
+1 -1
View File
@@ -174,7 +174,7 @@ void CAnimMaterialNode::UpdateDynamicParamsInternal()
//////////////////////////////////////////////////////////////////////////
unsigned int CAnimMaterialNode::GetParamCount() const
{
return s_nodeParams.size() + m_dynamicShaderParamInfos.size();
return static_cast<unsigned int>(s_nodeParams.size() + m_dynamicShaderParamInfos.size());
}
//////////////////////////////////////////////////////////////////////////
Gems/Maestro/Code/Source/Cinematics/Movie.cpp
+3 -3
View File
@@ -379,7 +379,7 @@ IAnimSequence* CMovieSystem::GetSequence(int i) const
//////////////////////////////////////////////////////////////////////////
int CMovieSystem::GetNumSequences() const
{
return m_sequences.size();
return static_cast<int>(m_sequences.size());
}
//////////////////////////////////////////////////////////////////////////
@@ -398,7 +398,7 @@ IAnimSequence* CMovieSystem::GetPlayingSequence(int i) const
//////////////////////////////////////////////////////////////////////////
int CMovieSystem::GetNumPlayingSequences() const
{
return m_playingSequences.size();
return static_cast<int>(m_playingSequences.size());
}
//////////////////////////////////////////////////////////////////////////
@@ -410,7 +410,7 @@ void CMovieSystem::AddSequence(IAnimSequence* sequence)
//////////////////////////////////////////////////////////////////////////
bool CMovieSystem::IsCutScenePlaying() const
{
const uint numPlayingSequences = m_playingSequences.size();
const uint numPlayingSequences = static_cast<uint>(m_playingSequences.size());
for (uint i = 0; i < numPlayingSequences; ++i)
{
const IAnimSequence* pAnimSequence = m_playingSequences[i].sequence.get();
Gems/Maestro/Code/Source/Cinematics/SceneNode.cpp
+2 -2
View File
@@ -254,7 +254,7 @@ void CAnimSceneNode::CreateDefaultTracks()
//////////////////////////////////////////////////////////////////////////
unsigned int CAnimSceneNode::GetParamCount() const
{
return s_nodeParams.size();
return static_cast<unsigned int>(s_nodeParams.size());
}
//////////////////////////////////////////////////////////////////////////
@@ -661,7 +661,7 @@ void CAnimSceneNode::OnStop()
//////////////////////////////////////////////////////////////////////////
void CAnimSceneNode::ResetSounds()
{
for (int i = m_SoundInfo.size(); --i >= 0; )
for (int i = static_cast<int>(m_SoundInfo.size()); --i >= 0; )
{
m_SoundInfo[i].Reset();
}
Gems/Maestro/Code/Source/Cinematics/ShadowsSetupNode.cpp
+1 -1
View File
@@ -81,7 +81,7 @@ void CShadowsSetupNode::OnReset()
//-----------------------------------------------------------------------------
unsigned int CShadowsSetupNode::GetParamCount() const
{
return ShadowSetupNode::s_shadowSetupParams.size();
return static_cast<int>(ShadowSetupNode::s_shadowSetupParams.size());
}
//-----------------------------------------------------------------------------
Gems/Maestro/Code/Source/Cinematics/TimeRangesTrack.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ void CTimeRangesTrack::GetKeyInfo(int key, const char*& description, float& dura
int CTimeRangesTrack::GetActiveKeyIndexForTime(const float time)
{
const unsigned int numKeys = m_keys.size();
const unsigned int numKeys = static_cast<unsigned int>(m_keys.size());
if (numKeys == 0 || m_keys[0].time > time)
{
Gems/Maestro/Code/Source/Components/EditorSequenceAgentComponent.cpp
+1 -1
View File
@@ -231,7 +231,7 @@ namespace Maestro
// check for paramType specialization attributes on the getter method of the virtual property. if found, reset
// to the eAnimParamType enum - this leaves the paramType name unchanged but changes the type.
for (int i = virtualProperty->m_getter->m_attributes.size(); --i >= 0;)
for (int i = static_cast<int>(virtualProperty->m_getter->m_attributes.size()); --i >= 0;)
{
if (virtualProperty->m_getter->m_attributes[i].first == AZ::Edit::Attributes::PropertyPosition)
{