izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Sequencer: Step to Next/Previous Mark should also look at global marked frames

Browse Source 
#jira UE-204790
#rb ludovic.chabant

[CL 30893057 by max chen in 5.4 branch]
This commit is contained in:
max chen
2024-01-25 13:26:02 -05:00
parent 161c053611
commit 9781890866
1 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Engine/Source/Editor/Sequencer/Private/Sequencer.cpp
View File

@@ -5247,8 +5247,6 @@ FFrameNumber FSequencer::OnGetNearestKey(FFrameTime InTime, ENearestKeyOption Ne
TArray<FMovieSceneMarkedFrame> GlobalMarkedFrames = GetGlobalMarkedFrames();
for (const FMovieSceneMarkedFrame& GlobalMarkedFrame : GlobalMarkedFrames)
{
FFrameNumber Diff = FMath::Abs(GlobalMarkedFrame.FrameNumber - CurrentTime);
if (!NearestTime.IsSet())
{
NearestTime = GlobalMarkedFrame.FrameNumber;
@@ -9876,11 +9874,35 @@ void FSequencer::StepToNextMark()
return;
}
FFrameNumber CurrentTime = GetLocalTime().Time.FloorToFrame();
TOptional<FFrameNumber> NearestTime;
const bool bForwards = true;
int32 MarkedIndex = FocusedMovieScene->FindNextMarkedFrame(GetLocalTime().Time.FloorToFrame(), bForwards);
int32 MarkedIndex = FocusedMovieScene->FindNextMarkedFrame(CurrentTime, bForwards);
if (MarkedIndex != INDEX_NONE)
{
SetLocalTimeDirectly(FocusedMovieScene->GetMarkedFrames()[MarkedIndex].FrameNumber.Value);
NearestTime = FocusedMovieScene->GetMarkedFrames()[MarkedIndex].FrameNumber.Value;
}
TArray<FMovieSceneMarkedFrame> GlobalMarkedFrames = GetGlobalMarkedFrames();
for (const FMovieSceneMarkedFrame& GlobalMarkedFrame : GlobalMarkedFrames)
{
if (GlobalMarkedFrame.FrameNumber > CurrentTime)
{
if (!NearestTime.IsSet())
{
NearestTime = GlobalMarkedFrame.FrameNumber;
}
else if (FMath::Abs(GlobalMarkedFrame.FrameNumber - CurrentTime) < FMath::Abs(NearestTime.GetValue() - CurrentTime))
{
NearestTime = GlobalMarkedFrame.FrameNumber;
}
}
}
if (NearestTime.IsSet())
{
SetLocalTimeDirectly(NearestTime.GetValue());
}
}
@@ -9898,11 +9920,35 @@ void FSequencer::StepToPreviousMark()
return;
}
FFrameNumber CurrentTime = GetLocalTime().Time.FloorToFrame();
TOptional<FFrameNumber> NearestTime;
const bool bForwards = false;
int32 MarkedIndex = FocusedMovieScene->FindNextMarkedFrame(GetLocalTime().Time.FloorToFrame(), bForwards);
int32 MarkedIndex = FocusedMovieScene->FindNextMarkedFrame(CurrentTime, bForwards);
if (MarkedIndex != INDEX_NONE)
{
SetLocalTimeDirectly(FocusedMovieScene->GetMarkedFrames()[MarkedIndex].FrameNumber.Value);
NearestTime = FocusedMovieScene->GetMarkedFrames()[MarkedIndex].FrameNumber.Value;
}
TArray<FMovieSceneMarkedFrame> GlobalMarkedFrames = GetGlobalMarkedFrames();
for (const FMovieSceneMarkedFrame& GlobalMarkedFrame : GlobalMarkedFrames)
{
if (GlobalMarkedFrame.FrameNumber < CurrentTime)
{
if (!NearestTime.IsSet())
{
NearestTime = GlobalMarkedFrame.FrameNumber;
}
else if (FMath::Abs(GlobalMarkedFrame.FrameNumber - CurrentTime) < FMath::Abs(NearestTime.GetValue() - CurrentTime))
{
NearestTime = GlobalMarkedFrame.FrameNumber;
}
}
}
if (NearestTime.IsSet())
{
SetLocalTimeDirectly(NearestTime.GetValue());
}
}