sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-03 01:09:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

Pass sample info to Skin.GetSample

Browse Source
This commit is contained in:
iiSaLMaN
2019-08-23 14:32:43 +03:00
parent 66d8440167
commit d8535574d1
8 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
osu.Game/Skinning/LegacySkin.cs
View File

@ -17,6 +17,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures;
using osu.Framework.IO.Stores;
using osu.Framework.Text;
using osu.Game.Audio;
using osu.Game.Database;
using osu.Game.Graphics;
using osu.Game.Graphics.Sprites;
@ -212,18 +213,21 @@ namespace osu.Game.Skinning
return texture;
}
public override SampleChannel GetSample(string sampleName)
public override SampleChannel GetSample(ISampleInfo sampleInfo)
{
var sample = Samples.Get(sampleName);
if (sample == null)
foreach (var lookup in sampleInfo.LookupNames)
{
// Try fallback to non-bank samples.
var bank = sampleName.Split('/').Last().Split('-')[0] + '-';
sample = Samples.Get($"Gameplay/{sampleName.Replace(bank, "")}");
var sample = Samples.Get(lookup);
if (sample != null)
return sample;
}
return sample;
if (sampleInfo is HitSampleInfo hsi)
// Try fallback to non-bank samples.
return Samples.Get($"{hsi.Name}");
return null;
}
private bool hasFont(string fontName) => GetTexture($"{fontName}-0") != null;