Merge pull request #18702 from nekodex/new-dialog-sfx

Add new dialog popup SFX

osu.Android.props

@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.527.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.615.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2022.615.0" />
   </ItemGroup>
   <ItemGroup Label="Transitive Dependencies">

osu.Game/Graphics/UserInterface/HoverSampleSet.cs

@@ -20,6 +20,12 @@ namespace osu.Game.Graphics.UserInterface
         TabSelect,
 
         [Description("scrolltotop")]
-        ScrollToTop
+        ScrollToTop,
+
+        [Description("dialog-cancel")]
+        DialogCancel,
+
+        [Description("dialog-ok")]
+        DialogOk
     }
 }

osu.Game/Overlays/Dialog/PopupDialogButton.cs

@@ -8,7 +8,8 @@ namespace osu.Game.Overlays.Dialog
 {
     public class PopupDialogButton : DialogButton
     {
-        public PopupDialogButton()
+        public PopupDialogButton(HoverSampleSet sampleSet = HoverSampleSet.Button)
+            : base(sampleSet)
         {
             Height = 50;
             BackgroundColour = Color4Extensions.FromHex(@"150e14");

osu.Game/Overlays/Dialog/PopupDialogCancelButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Dialog
 {
@@ -13,5 +14,10 @@ namespace osu.Game.Overlays.Dialog
         {
             ButtonColour = colours.Blue;
         }
+
+        public PopupDialogCancelButton()
+            : base(HoverSampleSet.DialogCancel)
+        {
+        }
     }
 }

osu.Game/Overlays/Dialog/PopupDialogDangerousButton.cs

@@ -2,9 +2,13 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Events;
+using osu.Game.Audio.Effects;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 
@@ -47,6 +51,33 @@ namespace osu.Game.Overlays.Dialog
             {
             }
 
+            private Sample tickSample;
+            private Sample confirmSample;
+            private double lastTickPlaybackTime;
+            private AudioFilter lowPassFilter = null!;
+
+            [BackgroundDependencyLoader]
+            private void load(AudioManager audio)
+            {
+                tickSample = audio.Samples.Get(@"UI/dialog-dangerous-tick");
+                confirmSample = audio.Samples.Get(@"UI/dialog-dangerous-select");
+
+                AddInternal(lowPassFilter = new AudioFilter(audio.SampleMixer));
+            }
+
+            protected override void LoadComplete()
+            {
+                base.LoadComplete();
+                Progress.BindValueChanged(progressChanged);
+            }
+
+            protected override void Confirm()
+            {
+                lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF);
+                confirmSample?.Play();
+                base.Confirm();
+            }
+
             protected override bool OnMouseDown(MouseDownEvent e)
             {
                 BeginConfirm();
@@ -56,7 +87,28 @@ namespace osu.Game.Overlays.Dialog
             protected override void OnMouseUp(MouseUpEvent e)
             {
                 if (!e.HasAnyButtonPressed)
+                {
+                    lowPassFilter.CutoffTo(AudioFilter.MAX_LOWPASS_CUTOFF);
                     AbortConfirm();
+                }
+            }
+
+            private void progressChanged(ValueChangedEvent<double> progress)
+            {
+                if (progress.NewValue < progress.OldValue) return;
+
+                if (Clock.CurrentTime - lastTickPlaybackTime < 30) return;
+
+                lowPassFilter.CutoffTo((int)(progress.NewValue * AudioFilter.MAX_LOWPASS_CUTOFF * 0.5));
+
+                var channel = tickSample.GetChannel();
+
+                channel.Frequency.Value = 1 + progress.NewValue * 0.5f;
+                channel.Volume.Value = 0.5f + progress.NewValue / 2f;
+
+                channel.Play();
+
+                lastTickPlaybackTime = Clock.CurrentTime;
             }
         }
     }

osu.Game/Overlays/Dialog/PopupDialogOkButton.cs

@@ -3,6 +3,7 @@
 
 using osu.Framework.Allocation;
 using osu.Game.Graphics;
+using osu.Game.Graphics.UserInterface;
 
 namespace osu.Game.Overlays.Dialog
 {
@@ -13,5 +14,10 @@ namespace osu.Game.Overlays.Dialog
         {
             ButtonColour = colours.Pink;
         }
+
+        public PopupDialogOkButton()
+            : base(HoverSampleSet.DialogOk)
+        {
+        }
     }
 }

osu.Game/Screens/Edit/Editor.cs

@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Edit
 
         public override bool? AllowTrackAdjustments => false;
 
+        protected override bool PlayExitSound => !ExitConfirmed && !switchingDifficulty;
+
         protected bool HasUnsavedChanges
         {
             get
@@ -99,6 +101,8 @@ namespace osu.Game.Screens.Edit
 
         protected bool ExitConfirmed { get; private set; }
 
+        private bool switchingDifficulty;
+
         private string lastSavedHash;
 
         private Container<EditorScreen> screenContainer;
@@ -857,7 +861,10 @@ namespace osu.Game.Screens.Edit
         }
 
         private void switchToNewDifficulty(RulesetInfo rulesetInfo, bool createCopy)
-            => loader?.ScheduleSwitchToNewDifficulty(editorBeatmap.BeatmapInfo, rulesetInfo, createCopy, GetState(rulesetInfo));
+        {
+            switchingDifficulty = true;
+            loader?.ScheduleSwitchToNewDifficulty(editorBeatmap.BeatmapInfo, rulesetInfo, createCopy, GetState(rulesetInfo));
+        }
 
         private EditorMenuItem createDifficultySwitchMenu()
         {

osu.Game/Screens/Menu/IntroScreen.cs

@@ -63,6 +63,8 @@ namespace osu.Game.Screens.Menu
 
         protected virtual string SeeyaSampleName => "Intro/seeya";
 
+        protected override bool PlayExitSound => false;
+
         private LeasedBindable<WorkingBeatmap> beatmap;
 
         private OsuScreen nextScreen;

osu.Game/Screens/Menu/MainMenu.cs

@@ -66,6 +66,8 @@ namespace osu.Game.Screens.Menu
 
         protected override BackgroundScreen CreateBackground() => background;
 
+        protected override bool PlayExitSound => false;
+
         private Bindable<double> holdDelay;
         private Bindable<bool> loginDisplayed;
 

osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs

@@ -37,6 +37,8 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
     {
         public override string Title => "Lounge";
 
+        protected override bool PlayExitSound => false;
+
         protected override BackgroundScreen CreateBackground() => new LoungeBackgroundScreen
         {
             SelectedRoom = { BindTarget = SelectedRoom }

osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs

@@ -41,6 +41,8 @@ namespace osu.Game.Screens.OnlinePlay.Multiplayer
 
         public override string ShortTitle => "room";
 
+        protected override bool PlayExitSound => !exitConfirmed;
+
         [Resolved]
         private MultiplayerClient client { get; set; }
 

osu.Game/Screens/OsuScreen.cs

@@ -77,7 +77,7 @@ namespace osu.Game.Screens
 
         private Sample sampleExit;
 
-        protected virtual bool PlayResumeSound => true;
+        protected virtual bool PlayExitSound => true;
 
         public virtual float BackgroundParallaxAmount => 1;
 
@@ -173,9 +173,6 @@ namespace osu.Game.Screens
 
         public override void OnResuming(ScreenTransitionEvent e)
         {
-            if (PlayResumeSound)
-                sampleExit?.Play();
-
             applyArrivingDefaults(true);
 
             // it's feasible to resume to a screen if the target screen never loaded successfully.
@@ -215,6 +212,9 @@ namespace osu.Game.Screens
 
         public override bool OnExiting(ScreenExitEvent e)
         {
+            if (ValidForResume && PlayExitSound)
+                sampleExit?.Play();
+
             if (ValidForResume && logo != null)
                 onExitingLogo();
 

osu.Game/Screens/Play/Player.cs

@@ -53,6 +53,8 @@ namespace osu.Game.Screens.Play
 
         public override bool AllowBackButton => false; // handled by HoldForMenuButton
 
+        protected override bool PlayExitSound => !isRestarting;
+
         protected override UserActivity InitialActivity => new UserActivity.InSoloGame(Beatmap.Value.BeatmapInfo, Ruleset.Value);
 
         public override float BackgroundParallaxAmount => 0.1f;
@@ -75,6 +77,8 @@ namespace osu.Game.Screens.Play
 
         public Action RestartRequested;
 
+        private bool isRestarting;
+
         private Bindable<bool> mouseWheelDisabled;
 
         private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
@@ -643,6 +647,8 @@ namespace osu.Game.Screens.Play
             if (!Configuration.AllowRestart)
                 return;
 
+            isRestarting = true;
+
             // at the point of restarting the track should either already be paused or the volume should be zero.
             // stopping here is to ensure music doesn't become audible after exiting back to PlayerLoader.
             musicController.Stop();

osu.Game/Screens/Play/PlayerLoader.cs

@@ -51,8 +51,6 @@ namespace osu.Game.Screens.Play
         // We show the previous screen status
         protected override UserActivity? InitialActivity => null;
 
-        protected override bool PlayResumeSound => false;
-
         protected BeatmapMetadataDisplay MetadataInfo { get; private set; } = null!;
 
         /// <summary>

osu.Game/osu.Game.csproj

@@ -37,7 +37,7 @@
     </PackageReference>
     <PackageReference Include="Realm" Version="10.14.0" />
     <PackageReference Include="ppy.osu.Framework" Version="2022.615.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.527.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.615.0" />
     <PackageReference Include="Sentry" Version="3.17.1" />
     <PackageReference Include="SharpCompress" Version="0.31.0" />
     <PackageReference Include="NUnit" Version="3.13.3" />

osu.iOS.props

@@ -62,7 +62,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2022.615.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.527.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2022.615.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net6.0) -->
   <PropertyGroup>