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

SoundControlPoint -> SampleControlPoint

Browse Source
This commit is contained in:
Dean Herbert
2017-12-23 16:31:45 +09:00
parent ff0927e71b
commit 5026c7a95e
12 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -208,11 +208,11 @@ namespace osu.Game.Rulesets.Taiko.UI
private void load(OsuColour colours, AudioManager audio)
{
allSamples = new Dictionary<double, Tuple<SampleChannel, SampleChannel>>();
foreach (var soundPoint in controlPointInfo.SoundPoints)
foreach (var s in controlPointInfo.SamplePoints)
{
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));
var normalSample = SampleInfo.FromSoundPoint(s).GetChannel(audio.Sample);
var clapSample = SampleInfo.FromSoundPoint(s, SampleInfo.HIT_CLAP).GetChannel(audio.Sample);
allSamples.Add(s.Time, new Tuple<SampleChannel, SampleChannel>(normalSample, clapSample));
}
overlayBackgroundContainer.BorderColour = colours.Gray0;
@ -281,7 +281,7 @@ namespace osu.Game.Rulesets.Taiko.UI
public bool OnPressed(TaikoAction action)
{
var currentTime = Clock.CurrentTime;
var soundPoint = currentTime < controlPointInfo.SoundPoints[0].Time ? controlPointInfo.SoundPoints[0] : controlPointInfo.SoundPointAt(currentTime);
var soundPoint = currentTime < controlPointInfo.SamplePoints[0].Time ? controlPointInfo.SamplePoints[0] : controlPointInfo.SamplePointAt(currentTime);
if (!allSamples.TryGetValue(soundPoint.Time, out Tuple<SampleChannel, SampleChannel> samples))
throw new InvalidOperationException("Current sample set not found.");