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

Add the ability for individual game modes to report statistics for display at song select.

This commit is contained in:
Dean Herbert 2017-01-30 13:12:30 +09:00
parent 3286713d11
commit e93f60396f
3 changed files with 49 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game.Modes.Osu/OsuRuleset.cs
View File

@ -2,6 +2,9 @@
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Collections.Generic;
using System.Linq;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Modes.Objects;
using osu.Game.Modes.Osu.Objects;
using osu.Game.Modes.Osu.UI;
@ -15,6 +18,22 @@ public class OsuRuleset : Ruleset
public override HitRenderer CreateHitRendererWith(List<HitObject> objects) => new OsuHitRenderer { Objects = objects };
public override IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new[]
{
new BeatmapStatistic
{
Name = @"Circle count",
Content = beatmap.Beatmap.HitObjects.Count(h => h is HitCircle).ToString(),
Icon = FontAwesome.fa_dot_circle_o
},
new BeatmapStatistic
{
Name = @"Slider count",
Content = beatmap.Beatmap.HitObjects.Count(h => h is Slider).ToString(),
Icon = FontAwesome.fa_circle_o
}
};
public override HitObjectParser CreateHitObjectParser() => new OsuHitObjectParser();
public override ScoreProcessor CreateScoreProcessor(int hitObjectCount) => new OsuScoreProcessor(hitObjectCount);

11
osu.Game/Modes/Ruleset.cs
View File

@ -9,15 +9,26 @@
using System;
using System.Collections.Concurrent;
using System.Linq;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
namespace osu.Game.Modes
{
public class BeatmapStatistic
{
public FontAwesome Icon;
public string Content;
public string Name;
}
public abstract class Ruleset
{
private static ConcurrentDictionary<PlayMode, Type> availableRulesets = new ConcurrentDictionary<PlayMode, Type>();
public abstract ScoreOverlay CreateScoreOverlay();
public virtual IEnumerable<BeatmapStatistic> GetBeatmapStatistics(WorkingBeatmap beatmap) => new BeatmapStatistic[] { };
public abstract ScoreProcessor CreateScoreProcessor(int hitObjectCount);
public abstract HitRenderer CreateHitRendererWith(List<HitObject> objects);

34
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -2,6 +2,7 @@
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using osu.Framework;
using osu.Framework.Allocation;
using OpenTK;
@ -15,8 +16,10 @@
using osu.Framework.Graphics.Colour;
using osu.Game.Beatmaps.Drawables;
using System.Linq;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Graphics;
using osu.Game.Beatmaps.Timing;
using osu.Game.Modes;
namespace osu.Game.Screens.Select
{
@ -26,7 +29,7 @@ class BeatmapInfoWedge : Container
private Container beatmapInfoContainer;
private BaseGame game;
private OsuGame game;
public BeatmapInfoWedge()
{
@ -44,7 +47,7 @@ public BeatmapInfoWedge()
}
[BackgroundDependencyLoader]
private void load(BaseGame game)
private void load(OsuGame game)
{
this.game = game;
}
@ -62,9 +65,16 @@ public void UpdateBeatmap(WorkingBeatmap beatmap)
BeatmapInfo beatmapInfo = beatmap.BeatmapInfo;
string bpm = getBPMRange(beatmap.Beatmap);
string length = TimeSpan.FromMilliseconds((beatmap.Beatmap.HitObjects.Last().EndTime - beatmap.Beatmap.HitObjects.First().StartTime)).ToString(@"m\:ss");
string hitCircles = beatmap.Beatmap.HitObjects.Count(h => h.Duration == 0).ToString();
string sliders = beatmap.Beatmap.HitObjects.Count(h => h.Duration > 0).ToString();
string length = TimeSpan.FromMilliseconds(beatmap.Beatmap.HitObjects.Last().EndTime - beatmap.Beatmap.HitObjects.First().StartTime).ToString(@"m\:ss");
List<InfoLabel> labels = new List<InfoLabel>
{
new InfoLabel(new BeatmapStatistic { Name = "Length", Content = length, Icon = FontAwesome.fa_clock_o }),
new InfoLabel(new BeatmapStatistic { Name = "BPM", Content = bpm, Icon = FontAwesome.fa_circle }),
};
//get statistics fromt he current ruleset.
Ruleset.GetRuleset(game.PlayMode.Value).GetBeatmapStatistics(beatmap).ForEach(s => labels.Add(new InfoLabel(s)));
(beatmapInfoContainer = new BufferedContainer
{
@ -152,13 +162,7 @@ public void UpdateBeatmap(WorkingBeatmap beatmap)
Margin = new MarginPadding { Top = 20 },
Spacing = new Vector2(40,0),
AutoSizeAxes = Axes.Both,
Children = new []
{
new InfoLabel(FontAwesome.fa_clock_o, length),
new InfoLabel(FontAwesome.fa_circle, bpm),
new InfoLabel(FontAwesome.fa_dot_circle_o, hitCircles),
new InfoLabel(FontAwesome.fa_circle_o, sliders),
}
Children = labels
},
}
},
@ -192,7 +196,7 @@ private string getBPMRange(Beatmap beatmap)
public class InfoLabel : Container
{
public InfoLabel(FontAwesome icon, string text)
public InfoLabel(BeatmapStatistic statistic)
{
AutoSizeAxes = Axes.Both;
Children = new[]
@ -205,7 +209,7 @@ public InfoLabel(FontAwesome icon, string text)
},
new TextAwesome
{
Icon = icon,
Icon = statistic.Icon,
Colour = new Color4(255, 221, 85, 255),
Scale = new Vector2(0.8f)
},
@ -214,7 +218,7 @@ public InfoLabel(FontAwesome icon, string text)
Margin = new MarginPadding { Left = 13 },
Font = @"Exo2.0-Bold",
Colour = new Color4(255, 221, 85, 255),
Text = text,
Text = statistic.Content,
TextSize = 17,
Origin = Anchor.CentreLeft
},