RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-13 18:37:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

First basic implementation of IKeyBindingHandler for the playfield so it can handle taiko hitsounds

Browse Source
This commit is contained in:
FreezyLemon 2017-12-07 23:11:34 +01:00
parent d2f3d5a807
commit 229c9b5b4e
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -16,10 +16,16 @@ using osu.Framework.Extensions.Color4Extensions;
using System.Linq; using System.Linq;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Taiko.Objects.Drawables; using osu.Game.Rulesets.Taiko.Objects.Drawables;
using osu.Framework.Input.Bindings;
using osu.Game.Beatmaps.ControlPoints;
using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using System.Collections.Generic;
using osu.Game.Audio;
namespace osu.Game.Rulesets.Taiko.UI namespace osu.Game.Rulesets.Taiko.UI
{ {
public class TaikoPlayfield : ScrollingPlayfield public class TaikoPlayfield : ScrollingPlayfield, IKeyBindingHandler<TaikoAction>
{ {
/// <summary> /// <summary>
/// Default height of a <see cref="TaikoPlayfield"/> when inside a <see cref="TaikoRulesetContainer"/>. /// Default height of a <see cref="TaikoPlayfield"/> when inside a <see cref="TaikoRulesetContainer"/>.
@ -54,9 +60,14 @@ namespace osu.Game.Rulesets.Taiko.UI
private readonly Box overlayBackground; private readonly Box overlayBackground;
private readonly Box background; private readonly Box background;
public TaikoPlayfield() private ControlPointInfo controlPointInfo;
private IEnumerable<Sample> allSamples;
private AudioManager audio;
public TaikoPlayfield(ControlPointInfo controlPointInfo)
: base(Axes.X) : base(Axes.X)
{ {
this.controlPointInfo = controlPointInfo;
AddRangeInternal(new Drawable[] AddRangeInternal(new Drawable[]
{ {
backgroundContainer = new Container backgroundContainer = new Container
@ -194,8 +205,15 @@ namespace osu.Game.Rulesets.Taiko.UI
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours, AudioManager audio)
{ {
this.audio = audio;
foreach (var soundPoint in controlPointInfo.SoundPoints)
{
SampleInfo.FromSoundPoint(soundPoint).GetChannel(audio.Sample);
}
overlayBackgroundContainer.BorderColour = colours.Gray0; overlayBackgroundContainer.BorderColour = colours.Gray0;
overlayBackground.Colour = colours.Gray1; overlayBackground.Colour = colours.Gray1;
@ -258,5 +276,14 @@ namespace osu.Game.Rulesets.Taiko.UI
kiaiExplosionContainer.Add(new KiaiHitExplosion(judgedObject, isRim)); kiaiExplosionContainer.Add(new KiaiHitExplosion(judgedObject, isRim));
} }
} }
public bool OnPressed(TaikoAction action)
{
var soundPoint = controlPointInfo.SoundPointAt(Time.Current);
return true;
}
public bool OnReleased(TaikoAction action) => false;
} }
} }

2
osu.Game.Rulesets.Taiko/UI/TaikoRulesetContainer.cs
View File

@ -93,7 +93,7 @@ namespace osu.Game.Rulesets.Taiko.UI
public override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo); public override PassThroughInputManager CreateInputManager() => new TaikoInputManager(Ruleset.RulesetInfo);
protected override Playfield CreatePlayfield() => new TaikoPlayfield protected override Playfield CreatePlayfield() => new TaikoPlayfield(Beatmap.ControlPointInfo)
{ {
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft Origin = Anchor.CentreLeft