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

Remove lookup logic from SkinnableSound

Browse Source
This commit is contained in:
iiSaLMaN 2019-08-23 14:55:38 +03:00
parent b6b050d5e9
commit da72806693
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
osu.Game/Skinning/SkinnableSound.cs
View File

@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Allocation; using osu.Framework.Allocation;
@ -43,28 +42,21 @@ namespace osu.Game.Skinning
{ {
channels = hitSamples.Select(s => channels = hitSamples.Select(s =>
{ {
var ch = loadChannel(s, skin.GetSample); var ch = skin.GetSample(s);
if (ch == null && allowFallback) if (ch == null && allowFallback)
ch = loadChannel(s, audio.Samples.Get); if (s is HitSampleInfo hsi)
ch = audio.Samples.Get(string.IsNullOrEmpty(hsi.Namespace)
? $"Gameplay/{hsi.Namespace}/{hsi.Bank}-{hsi.Name}"
: $"Gameplay/{hsi.Bank}-{hsi.Name}");
if (ch != null)
ch.Volume.Value = s.Volume / 100.0;
return ch; return ch;
}).Where(c => c != null).ToArray(); }).Where(c => c != null).ToArray();
} }
private SampleChannel loadChannel(ISampleInfo info, Func<string, SampleChannel> getSampleFunction)
{
foreach (var lookup in info.LookupNames)
{
var ch = getSampleFunction($"Gameplay/{lookup}");
if (ch == null)
continue;
ch.Volume.Value = info.Volume / 100.0;
return ch;
}
return null;
}
protected override void Dispose(bool isDisposing) protected override void Dispose(bool isDisposing)
{ {
base.Dispose(isDisposing); base.Dispose(isDisposing);