sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-02 22:26:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Decode beatmap colours

Browse Source
This commit is contained in:
Drew DeVault
2016-10-10 13:00:16 -04:00
committed by Dean Herbert
parent c0022f3515
commit 7a4501323b
6 changed files with 82 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Beatmaps/Formats/OsuLegacyDecoder.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using OpenTK.Graphics;
using osu.Game.Beatmaps.Events;
using osu.Game.Beatmaps.Objects;
using osu.Game.Beatmaps.Samples;
@ -180,6 +181,24 @@ namespace osu.Game.Beatmaps.Formats
// TODO
}
private void HandleColours(Beatmap beatmap, string key, string val)
{
string[] split = val.Split(',');
if (split.Length != 3)
throw new InvalidOperationException($@"Color specified in incorrect format (should be R,G,B): {val}");
byte r, g, b;
if (!byte.TryParse(split[0], out r) || !byte.TryParse(split[1], out g) || !byte.TryParse(split[2], out b))
throw new InvalidOperationException($@"Color must be specified with 8-bit integer components");
// Note: the combo index specified in the beatmap is discarded
beatmap.ComboColors.Add(new Color4
{
R = r / 255f,
G = g / 255f,
B = b / 255f,
A = 1f,
});
}
public override Beatmap Decode(TextReader stream)
{
var beatmap = new Beatmap
@ -188,6 +207,7 @@ namespace osu.Game.Beatmaps.Formats
BaseDifficulty = new BaseDifficulty(),
HitObjects = new List<HitObject>(),
ControlPoints = new List<ControlPoint>(),
ComboColors = new List<Color4>(),
};
var section = Section.None;
string line;
@ -210,8 +230,7 @@ namespace osu.Game.Beatmaps.Formats
}
string val = line, key = null;
if (section != Section.Events && section != Section.TimingPoints
&& section != Section.HitObjects)
if (section != Section.Events && section != Section.TimingPoints && section != Section.HitObjects)
{
key = val.Remove(val.IndexOf(':')).Trim();
val = val.Substring(val.IndexOf(':') + 1).Trim();
@ -236,6 +255,9 @@ namespace osu.Game.Beatmaps.Formats
case Section.TimingPoints:
HandleTimingPoints(beatmap, val);
break;
case Section.Colours:
HandleColours(beatmap, key, val);
break;
case Section.HitObjects:
beatmap.HitObjects.Add(HitObject.Parse(beatmap.Mode, val));
break;