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

Apply beatmap settings when creating the DrawableStoryboard.

This commit is contained in:
Damnae 2017-09-25 11:03:57 +02:00
parent 0996867112
commit 2d4616fd43
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
osu.Game/Screens/Play/Player.cs
View File

@ -231,12 +231,9 @@ private void initializeStoryboard(bool asyncLoad)
{
var beatmap = Beatmap.Value.Beatmap;
storyboard = beatmap.Storyboard.CreateDrawable();
storyboard.Width = storyboard.Height * beatmap.Storyboard.AspectRatio(beatmap.BeatmapInfo);
storyboard = beatmap.Storyboard.CreateDrawable(Beatmap.Value);
storyboard.Masking = true;
if (!beatmap.Storyboard.ReplacesBackground(beatmap.BeatmapInfo))
storyboard.BackgroundTexture = Beatmap.Value.Background;
storyboardContainer.Add(asyncLoad ? new AsyncLoadWrapper(storyboard) { RelativeSizeAxes = Axes.Both } : (Drawable)storyboard);
}

14
osu.Game/Storyboards/Storyboard.cs
View File

@ -47,7 +47,17 @@ public bool ReplacesBackground(BeatmapInfo beatmapInfo)
public float AspectRatio(BeatmapInfo beatmapInfo)
=> beatmapInfo.WidescreenStoryboard ? 16 / 9f : 4 / 3f;
public DrawableStoryboard CreateDrawable()
=> new DrawableStoryboard(this);
public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
{
var drawable = new DrawableStoryboard(this);
if (working != null)
{
var beatmapInfo = working.Beatmap.BeatmapInfo;
drawable.Width = drawable.Height * AspectRatio(beatmapInfo);
if (!ReplacesBackground(beatmapInfo))
drawable.BackgroundTexture = working.Background;
}
return drawable;
}
}
}

6
osu.Game/Tests/Visual/TestCaseStoryboard.cs
View File

@ -81,13 +81,9 @@ private void loadStoryboard(WorkingBeatmap working)
var decoupledClock = new DecoupleableInterpolatingFramedClock { IsCoupled = true };
storyboardContainer.Clock = decoupledClock;
storyboard = working.Beatmap.Storyboard.CreateDrawable();
storyboard = working.Beatmap.Storyboard.CreateDrawable(beatmapBacking);
storyboard.Passing = false;
var beatmap = working.Beatmap;
if (!beatmap.Storyboard.ReplacesBackground(beatmap.BeatmapInfo))
storyboard.BackgroundTexture = working.Background;
storyboardContainer.Add(storyboard);
decoupledClock.ChangeSource(working.Track);
}