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

Apply review

Browse Source
This commit is contained in:
Dean Herbert 2018-02-24 23:07:02 +09:00
parent 768e0a4e2a
commit 4a52df2dd4
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
osu.Game.Rulesets.Taiko/Audio/DrumSampleMapping.cs
View File

@ -13,7 +13,7 @@ namespace osu.Game.Rulesets.Taiko.Audio
private readonly ControlPointInfo controlPoints; private readonly ControlPointInfo controlPoints;
private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>(); private readonly Dictionary<double, DrumSample> mappings = new Dictionary<double, DrumSample>();
public readonly List<SkinnableSound> Drawables = new List<SkinnableSound>(); public readonly List<SkinnableSound> Sounds = new List<SkinnableSound>();
public DrumSampleMapping(ControlPointInfo controlPoints) public DrumSampleMapping(ControlPointInfo controlPoints)
{ {
@ -37,16 +37,16 @@ namespace osu.Game.Rulesets.Taiko.Audio
mappings[s.Time] = new DrumSample mappings[s.Time] = new DrumSample
{ {
Centre = addDrawableSound(centre), Centre = addSound(centre),
Rim = addDrawableSound(rim) Rim = addSound(rim)
}; };
} }
} }
private SkinnableSound addDrawableSound(SampleInfo rim) private SkinnableSound addSound(SampleInfo sampleInfo)
{ {
var drawable = new SkinnableSound(rim); var drawable = new SkinnableSound(sampleInfo);
Drawables.Add(drawable); Sounds.Add(drawable);
return drawable; return drawable;
} }

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

@ -63,7 +63,7 @@ namespace osu.Game.Rulesets.Taiko.UI
} }
}; };
AddRangeInternal(sampleMappings.Drawables); AddRangeInternal(sampleMappings.Sounds);
} }
/// <summary> /// <summary>

5
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -33,10 +33,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
protected SkinnableSound Samples; protected SkinnableSound Samples;
protected virtual IEnumerable<SampleInfo> GetSamples() protected virtual IEnumerable<SampleInfo> GetSamples() => HitObject.Samples;
{
return HitObject.Samples;
}
private List<DrawableHitObject> nestedHitObjects; private List<DrawableHitObject> nestedHitObjects;
public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects; public IReadOnlyList<DrawableHitObject> NestedHitObjects => nestedHitObjects;

2
osu.Game/Skinning/SkinReloadableDrawable.cs
View File

@ -20,7 +20,7 @@ namespace osu.Game.Skinning
private readonly bool allowDefaultFallback; private readonly bool allowDefaultFallback;
/// <summary> /// <summary>
/// Create a new /// Create a new <see cref="SkinReloadableDrawable"/>
/// </summary> /// </summary>
/// <param name="fallback">Whether fallback to default skin should be allowed if the custom skin is missing this resource.</param> /// <param name="fallback">Whether fallback to default skin should be allowed if the custom skin is missing this resource.</param>
protected SkinReloadableDrawable(bool fallback = true) protected SkinReloadableDrawable(bool fallback = true)