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

Video no longer modifies storyboard resolution

This commit is contained in:
voidedWarranties 2020-03-24 20:04:09 -07:00
parent f2e0fba164
commit b8f20831a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Beatmaps/Formats/LegacyStoryboardDecoder.cs
View File

@ -90,9 +90,9 @@ private void handleEvents(string line)
case LegacyEventType.Video:
{
var offset = Parsing.ParseInt(split[1]);
var filename = CleanFilename(split[2]);
var path = CleanFilename(split[2]);
storyboard.GetLayer("Video").Add(new StoryboardVideo(filename, offset));
storyboard.GetLayer("Video").Add(new StoryboardVideo(path, offset));
break;
}

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

@ -21,7 +21,7 @@ public class Storyboard
public Storyboard()
{
layers.Add("Video", new StoryboardLayer("Video", 4));
layers.Add("Video", new StoryboardLayer("Video", 4, false));
layers.Add("Background", new StoryboardLayer("Background", 3));
layers.Add("Fail", new StoryboardLayer("Fail", 2) { VisibleWhenPassing = false, });
layers.Add("Pass", new StoryboardLayer("Pass", 1) { VisibleWhenFailing = false, });
@ -57,7 +57,7 @@ public bool ReplacesBackground
public DrawableStoryboard CreateDrawable(WorkingBeatmap working = null)
{
var drawable = new DrawableStoryboard(this);
drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard || GetLayer("Video").Elements.Any() ? 16 / 9f : 4 / 3f);
drawable.Width = drawable.Height * (BeatmapInfo.WidescreenStoryboard ? 16 / 9f : 4 / 3f);
return drawable;
}
}