GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix stack overflow when using recursion with nested scene animations

Browse Source 
#519
This commit is contained in:
Wojtek Figat
2021-07-30 14:29:40 +02:00
parent 563eecebda
commit 25487c17e3
5 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/Engine/Animations/SceneAnimations/SceneAnimationPlayer.cpp
View File

@@ -192,7 +192,8 @@ void SceneAnimationPlayer::Tick(float dt)
_cameraCutCam = nullptr;
// Tick the animation
Tick(anim, time, dt, 0);
CallStack callStack;
Tick(anim, time, dt, 0, callStack);
#if !BUILD_RELEASE
if (_tracksDataStack.Count() != 0)
{
@@ -486,9 +487,12 @@ bool SceneAnimationPlayer::TickPropertyTrack(int32 trackIndex, int32 stateIndexO
return true;
}
void SceneAnimationPlayer::Tick(SceneAnimation* anim, float time, float dt, int32 stateIndexOffset)
void SceneAnimationPlayer::Tick(SceneAnimation* anim, float time, float dt, int32 stateIndexOffset, CallStack& callStack)
{
const float fps = anim->FramesPerSecond;
#if !BUILD_RELEASE || USE_EDITOR
callStack.Add(anim);
#endif
// Update all tracks
for (int32 j = 0; j < anim->Tracks.Count(); j++)
@@ -546,7 +550,20 @@ void SceneAnimationPlayer::Tick(SceneAnimation* anim, float time, float dt, int3
return;
}
Tick(nestedAnim, mediaTime, dt, stateIndexOffset);
#if !BUILD_RELEASE || USE_EDITOR
// Validate recursive call
if (callStack.Contains(nestedAnim))
{
LOG(Warning,
"Recursive nested scene animation. Animation {0} for nested track {1} on actor {2}.",
callStack.Last()->ToString(),
nestedAnim->ToString(),
ToString());
return;
}
#endif
Tick(nestedAnim, mediaTime, dt, stateIndexOffset, callStack);
}
break;
}