RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix CommandLoop start and end time.

This commit is contained in:
Damnae 2017-09-08 18:03:04 +02:00
parent e63fb5720c
commit 3f2598543c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Storyboards/CommandLoop.cs
View File

@ -11,6 +11,9 @@ public class CommandLoop : CommandTimelineGroup
public double LoopStartTime;
public int LoopCount;
public override double StartTime => LoopStartTime;
public override double EndTime => LoopStartTime + CommandsDuration * LoopCount;
public CommandLoop(double startTime, int loopCount)
{
LoopStartTime = startTime;
@ -21,7 +24,7 @@ public override void ApplyTransforms(Drawable drawable, double offset = 0)
=> base.ApplyTransforms(drawable, offset + LoopStartTime);
protected override void PostProcess(ICommand command, TransformSequence<Drawable> sequence)
=> sequence.Loop(Duration - command.Duration, LoopCount);
=> sequence.Loop(CommandsDuration - command.Duration, LoopCount);
public override string ToString()
=> $"{LoopStartTime} x{LoopCount}";

9
osu.Game/Storyboards/CommandTimelineGroup.cs
View File

@ -39,9 +39,14 @@ public IEnumerable<ICommandTimeline> Timelines
}
}
public double StartTime => Timelines.Where(t => t.HasCommands).Min(t => t.StartTime);
public double EndTime => Timelines.Where(t => t.HasCommands).Max(t => t.EndTime);
public double CommandsStartTime => Timelines.Where(t => t.HasCommands).Min(t => t.StartTime);
public double CommandsEndTime => Timelines.Where(t => t.HasCommands).Max(t => t.EndTime);
public double CommandsDuration => CommandsEndTime - CommandsStartTime;
public virtual double StartTime => CommandsStartTime;
public virtual double EndTime => CommandsEndTime;
public double Duration => EndTime - StartTime;
public bool HasCommands => Timelines.Any(t => t.HasCommands);
public virtual void ApplyTransforms(Drawable drawable, double offset = 0)