h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-20 15:53:22 +08:00
Code Issues Releases Wiki Activity

Add KeyCounter to Player for fun.

Browse Source
This commit is contained in:
Dean Herbert 2016-10-06 23:33:09 +09:00
parent 10468a566c
commit 5ff9d828eb
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/GameModes/Play/Player.cs
View File

@ -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),
}
});
}
}
}

10
osu.Game/Graphics/UserInterface/KeyCounterCollection.cs
View File

@ -16,7 +16,15 @@ namespace osu.Game.Graphics.UserInterface
}
private List<KeyCounter> counters = new List<KeyCounter>();
public IReadOnlyList<KeyCounter> Counters => counters;
public IEnumerable<KeyCounter> Counters
{
get { return counters; }
set
{
foreach (var k in value)
AddKey(k);
}
}
public void AddKey(KeyCounter key)
{