From 5ff9d828eb208932586970ac8351562501653a01 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Thu, 6 Oct 2016 23:33:09 +0900 Subject: [PATCH] Add KeyCounter to Player for fun. --- osu.Game/GameModes/Play/Player.cs | 23 +++++++++++++++---- .../UserInterface/KeyCounterCollection.cs | 10 +++++++- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/osu.Game/GameModes/Play/Player.cs b/osu.Game/GameModes/Play/Player.cs index 26da692457..3a8685b501 100644 --- a/osu.Game/GameModes/Play/Player.cs +++ b/osu.Game/GameModes/Play/Player.cs @@ -12,11 +12,14 @@ using osu.Framework.Timing; using osu.Game.Beatmaps; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Osu; +using osu.Game.GameModes.Backgrounds; using osu.Game.GameModes.Play.Catch; using osu.Game.GameModes.Play.Mania; using osu.Game.GameModes.Play.Osu; using osu.Game.GameModes.Play.Taiko; +using osu.Game.Graphics.UserInterface; using OpenTK; +using OpenTK.Input; namespace osu.Game.GameModes.Play { @@ -59,7 +62,6 @@ namespace osu.Game.GameModes.Play Add(new OsuHitRenderer { Objects = beatmap.HitObjects, - Scale = new Vector2(0.8f), Anchor = Anchor.Centre, Origin = Anchor.Centre }); @@ -68,7 +70,6 @@ namespace osu.Game.GameModes.Play Add(new TaikoHitRenderer { Objects = beatmap.HitObjects, - Scale = new Vector2(0.8f), Anchor = Anchor.Centre, Origin = Anchor.Centre }); @@ -77,7 +78,6 @@ namespace osu.Game.GameModes.Play Add(new CatchHitRenderer { Objects = beatmap.HitObjects, - Scale = new Vector2(0.8f), Anchor = Anchor.Centre, Origin = Anchor.Centre }); @@ -86,12 +86,27 @@ namespace osu.Game.GameModes.Play Add(new ManiaHitRenderer { Objects = beatmap.HitObjects, - Scale = new Vector2(0.8f), Anchor = Anchor.Centre, Origin = Anchor.Centre }); break; } + + Add(new KeyCounterCollection + { + IsCounting = true, + FadeTime = 50, + Anchor = Anchor.BottomRight, + Origin = Anchor.BottomRight, + Position = new Vector2(10, 50), + Counters = new KeyCounter[] + { + new KeyCounterKeyboard(@"Z", Key.Z), + new KeyCounterKeyboard(@"X", Key.X), + new KeyCounterMouse(@"M1", MouseButton.Left), + new KeyCounterMouse(@"M2", MouseButton.Right), + } + }); } } } \ No newline at end of file diff --git a/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs b/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs index ee1447c03b..288d1e2018 100644 --- a/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs +++ b/osu.Game/Graphics/UserInterface/KeyCounterCollection.cs @@ -16,7 +16,15 @@ namespace osu.Game.Graphics.UserInterface } private List counters = new List(); - public IReadOnlyList Counters => counters; + public IEnumerable Counters + { + get { return counters; } + set + { + foreach (var k in value) + AddKey(k); + } + } public void AddKey(KeyCounter key) {