mirror of
https://github.com/ppy/osu.git
synced 2025-01-12 17:43:05 +08:00
Fix incorrect start time calculations
`LoopStartTime` is now baked into each `IStoryboardCommand`.
This commit is contained in:
parent
6c257e5159
commit
87b065b8c3
@ -41,7 +41,7 @@ namespace osu.Game.Storyboards
|
|||||||
foreach (var loop in loopGroups)
|
foreach (var loop in loopGroups)
|
||||||
{
|
{
|
||||||
command = loop.Alpha.FirstOrDefault();
|
command = loop.Alpha.FirstOrDefault();
|
||||||
if (command != null) alphaCommands.Add((command.StartTime + loop.LoopStartTime, command.StartValue == 0));
|
if (command != null) alphaCommands.Add((command.StartTime, command.StartValue == 0));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (alphaCommands.Count > 0)
|
if (alphaCommands.Count > 0)
|
||||||
@ -120,8 +120,6 @@ namespace osu.Game.Storyboards
|
|||||||
return trigger;
|
return trigger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override string ToString() => $"{Path}, {Origin}, {InitialPosition}";
|
|
||||||
|
|
||||||
public void ApplyTransforms(Drawable drawable, IEnumerable<Tuple<StoryboardCommandGroup, double>>? triggeredGroups = null)
|
public void ApplyTransforms(Drawable drawable, IEnumerable<Tuple<StoryboardCommandGroup, double>>? triggeredGroups = null)
|
||||||
{
|
{
|
||||||
// For performance reasons, we need to apply the commands in order by start time. Not doing so will cause many functions to be interleaved, resulting in O(n^2) complexity.
|
// For performance reasons, we need to apply the commands in order by start time. Not doing so will cause many functions to be interleaved, resulting in O(n^2) complexity.
|
||||||
@ -140,6 +138,8 @@ namespace osu.Game.Storyboards
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override string ToString() => $"{Path}, {Origin}, {InitialPosition}";
|
||||||
|
|
||||||
// todo: need to revisit property initialisation. apparently it has to be done per first command of every affected property (transforms are supposed to do that already?).
|
// todo: need to revisit property initialisation. apparently it has to be done per first command of every affected property (transforms are supposed to do that already?).
|
||||||
// private void generateCommands<T>(List<IGeneratedCommand> resultList, IEnumerable<StoryboardCommandList<T>.TypedCommand> commands,
|
// private void generateCommands<T>(List<IGeneratedCommand> resultList, IEnumerable<StoryboardCommandList<T>.TypedCommand> commands,
|
||||||
// DrawablePropertyInitializer<T> initializeProperty, DrawableTransform<T> transform, bool alwaysInitialize = true)
|
// DrawablePropertyInitializer<T> initializeProperty, DrawableTransform<T> transform, bool alwaysInitialize = true)
|
||||||
|
Loading…
Reference in New Issue
Block a user