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

Added sample preloading and playing

Browse Source
This commit is contained in:
FreezyLemon
2017-12-08 08:32:16 +01:00
parent 9e3d439f0a
commit 40e750f309
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ using osu.Framework.Audio;
using osu.Framework.Audio.Sample; using osu.Framework.Audio.Sample;
using System.Collections.Generic; using System.Collections.Generic;
using osu.Game.Audio; using osu.Game.Audio;
using System;
namespace osu.Game.Rulesets.Taiko.UI namespace osu.Game.Rulesets.Taiko.UI
{ {
@ -61,7 +62,7 @@ namespace osu.Game.Rulesets.Taiko.UI
private readonly Box background; private readonly Box background;
private ControlPointInfo controlPointInfo; private ControlPointInfo controlPointInfo;
private IEnumerable<Sample> allSamples; private SortedDictionary<double, Tuple<SampleChannel, SampleChannel>> allSamples;
private AudioManager audio; private AudioManager audio;
public TaikoPlayfield(ControlPointInfo controlPointInfo) public TaikoPlayfield(ControlPointInfo controlPointInfo)
@ -211,7 +212,9 @@ namespace osu.Game.Rulesets.Taiko.UI
foreach (var soundPoint in controlPointInfo.SoundPoints) foreach (var soundPoint in controlPointInfo.SoundPoints)
{ {
SampleInfo.FromSoundPoint(soundPoint).GetChannel(audio.Sample); var normalSample = SampleInfo.FromSoundPoint(soundPoint).GetChannel(audio.Sample);
var clapSample = SampleInfo.FromSoundPoint(soundPoint, SampleInfo.HIT_CLAP).GetChannel(audio.Sample);
allSamples.Add(soundPoint.Time, new Tuple<SampleChannel, SampleChannel>(normalSample, clapSample));
} }
overlayBackgroundContainer.BorderColour = colours.Gray0; overlayBackgroundContainer.BorderColour = colours.Gray0;
@ -279,7 +282,13 @@ namespace osu.Game.Rulesets.Taiko.UI
public bool OnPressed(TaikoAction action) public bool OnPressed(TaikoAction action)
{ {
var soundPoint = controlPointInfo.SoundPointAt(Time.Current); if (!allSamples.TryGetValue(controlPointInfo.SoundPointAt(Clock.CurrentTime).Time, out Tuple<SampleChannel, SampleChannel> samples))
throw new InvalidOperationException("Current sample set not found.");
if (action == TaikoAction.LeftCentre || action == TaikoAction.RightCentre)
samples.Item1.Play();
else
samples.Item2.Play();
return true; return true;
} }