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

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
This commit is contained in:
Esteban Papp
2021-08-26 08:23:02 -07:00
parent e5e271f45a 040b75c02c
commit 906ace3d03
66 changed files with 331 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/LyShine/Code/Source/Animation/UiAnimationSystem.cpp
+6 -11
View File
@@ -735,7 +735,7 @@ void UiAnimationSystem::ShowPlayedSequencesDebug()
//f32 purple[4] = {1, 0, 1, 1};
//f32 white[4] = {1, 1, 1, 1};
float y = 10.0f;
std::vector<const char*> names;
AZStd::vector<AZStd::string> names;
for (PlayingSequences::iterator it = m_playingSequences.begin(); it != m_playingSequences.end(); ++it)
{
@@ -756,23 +756,18 @@ void UiAnimationSystem::ShowPlayedSequencesDebug()
{
// Checks nodes which happen to be in several sequences.
// Those can be a bug, since several sequences may try to control the same entity.
const char* name = playingSequence.sequence->GetNode(i)->GetName();
AZStd::string name = playingSequence.sequence->GetNode(i)->GetName();
bool alreadyThere = false;
for (size_t k = 0; k < names.size(); ++k)
if (AZStd::find(names.begin(), names.end(), name) != names.end())
{
if (strcmp(names[k], name) == 0)
{
alreadyThere = true;
break;
}
alreadyThere = true;
}
if (alreadyThere == false)
else
{
names.push_back(name);
}
//gEnv->pRenderer->Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name);
//gEnv->pRenderer->Draw2dLabel((21.0f + 100.0f * i), ((i % 2) ? (y + 8.0f) : y), 1.0f, alreadyThere ? white : purple, false, "%s", name.c_str());
}
y += 32.0f;