From 8f57bf2498f628b0b751390714e4554faeb7617b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 26 Nov 2017 02:10:25 +0900 Subject: [PATCH] Add choices of hover sample sets --- osu.Game/Graphics/UserInterface/OsuButton.cs | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/OsuButton.cs b/osu.Game/Graphics/UserInterface/OsuButton.cs index 884a3037a5..3b2377c06b 100644 --- a/osu.Game/Graphics/UserInterface/OsuButton.cs +++ b/osu.Game/Graphics/UserInterface/OsuButton.cs @@ -1,9 +1,11 @@ // Copyright (c) 2007-2017 ppy Pty Ltd . // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE +using System.ComponentModel; using osu.Framework.Allocation; using osu.Framework.Audio; using osu.Framework.Audio.Sample; +using osu.Framework.Extensions; using osu.Framework.Graphics.UserInterface; using osu.Framework.Input; @@ -17,6 +19,8 @@ namespace osu.Game.Graphics.UserInterface private SampleChannel sampleClick; private SampleChannel sampleHover; + protected HoverSampleSet SampleSet = HoverSampleSet.Normal; + protected override bool OnClick(InputState state) { sampleClick?.Play(); @@ -30,10 +34,20 @@ namespace osu.Game.Graphics.UserInterface } [BackgroundDependencyLoader] - private void load(OsuColour colours, AudioManager audio) + private void load(AudioManager audio) { - sampleClick = audio.Sample.Get(@"UI/generic-select"); - sampleHover = audio.Sample.Get(@"UI/generic-hover"); + sampleClick = audio.Sample.Get($@"UI/generic-select{SampleSet.GetDescription()}"); + sampleHover = audio.Sample.Get($@"UI/generic-hover{SampleSet.GetDescription()}"); + } + + public enum HoverSampleSet + { + [Description("")] + Normal, + [Description("-soft")] + Soft, + [Description("-softer")] + Softer } } }