sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-06 16:13:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Read UseSkinSprites when decoding storyboards

Browse Source
This commit is contained in:
Bartłomiej Dach
2020-10-19 23:32:04 +02:00
parent e54836a63e
commit cdd56ece87
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,6 +48,10 @@ namespace osu.Game.Beatmaps.Formats
switch (section) switch (section)
{ {
case Section.General:
handleGeneral(storyboard, line);
return;
case Section.Events: case Section.Events:
handleEvents(line); handleEvents(line);
return; return;
@ -60,6 +64,18 @@ namespace osu.Game.Beatmaps.Formats
base.ParseLine(storyboard, section, line); base.ParseLine(storyboard, section, line);
} }
private void handleGeneral(Storyboard storyboard, string line)
{
var pair = SplitKeyVal(line);
switch (pair.Key)
{
case "UseSkinSprites":
storyboard.UseSkinSprites = pair.Value == "1";
break;
}
}
private void handleEvents(string line) private void handleEvents(string line)
{ {
var depth = 0; var depth = 0;

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

@ -15,6 +15,11 @@ namespace osu.Game.Storyboards
public BeatmapInfo BeatmapInfo = new BeatmapInfo(); public BeatmapInfo BeatmapInfo = new BeatmapInfo();
/// <summary>
/// Whether the storyboard can fall back to skin sprites in case no matching storyboard sprites are found.
/// </summary>
public bool UseSkinSprites { get; set; }
public bool HasDrawable => Layers.Any(l => l.Elements.Any(e => e.IsDrawable)); public bool HasDrawable => Layers.Any(l => l.Elements.Any(e => e.IsDrawable));
public double FirstEventTime => Layers.Min(l => l.Elements.FirstOrDefault()?.StartTime ?? 0); public double FirstEventTime => Layers.Min(l => l.Elements.FirstOrDefault()?.StartTime ?? 0);