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

Apply NRT to FailAnimation

Browse Source
This commit is contained in:
Dean Herbert 2022-08-25 14:35:42 +09:00
parent 8f4a953d11
commit ec60e16439
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Screens/Play/FailAnimation.cs
View File

@ -1,14 +1,11 @@
// 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.
#nullable disable
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Bindables; using osu.Framework.Bindables;
using osu.Game.Rulesets.UI; using osu.Game.Rulesets.UI;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using JetBrains.Annotations;
using ManagedBass.Fx; using ManagedBass.Fx;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio.Sample; using osu.Framework.Audio.Sample;
@ -34,27 +31,27 @@ namespace osu.Game.Screens.Play
/// </summary> /// </summary>
public class FailAnimation : Container public class FailAnimation : Container
{ {
public Action OnComplete; public Action? OnComplete;
private readonly DrawableRuleset drawableRuleset; private readonly DrawableRuleset drawableRuleset;
private readonly BindableDouble trackFreq = new BindableDouble(1); private readonly BindableDouble trackFreq = new BindableDouble(1);
private readonly BindableDouble volumeAdjustment = new BindableDouble(0.5); private readonly BindableDouble volumeAdjustment = new BindableDouble(0.5);
private Container filters; private Container filters = null!;
private Box redFlashLayer; private Box redFlashLayer = null!;
private Track track; private Track? track;
private AudioFilter failLowPassFilter; private AudioFilter failLowPassFilter = null!;
private AudioFilter failHighPassFilter; private AudioFilter failHighPassFilter = null!;
private const float duration = 2500; private const float duration = 2500;
private Sample failSample; private Sample? failSample;
[Resolved] [Resolved]
private OsuConfigManager config { get; set; } private OsuConfigManager config { get; set; } = null!;
protected override Container<Drawable> Content { get; } = new Container protected override Container<Drawable> Content { get; } = new Container
{ {
@ -66,8 +63,7 @@ namespace osu.Game.Screens.Play
/// <summary> /// <summary>
/// The player screen background, used to adjust appearance on failing. /// The player screen background, used to adjust appearance on failing.
/// </summary> /// </summary>
[CanBeNull] public BackgroundScreen? Background { private get; set; }
public BackgroundScreen Background { private get; set; }
public FailAnimation(DrawableRuleset drawableRuleset) public FailAnimation(DrawableRuleset drawableRuleset)
{ {
@ -127,7 +123,7 @@ namespace osu.Game.Screens.Play
failHighPassFilter.CutoffTo(300); failHighPassFilter.CutoffTo(300);
failLowPassFilter.CutoffTo(300, duration, Easing.OutCubic); failLowPassFilter.CutoffTo(300, duration, Easing.OutCubic);
failSample.Play(); failSample?.Play();
track.AddAdjustment(AdjustableProperty.Frequency, trackFreq); track.AddAdjustment(AdjustableProperty.Frequency, trackFreq);
track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment); track.AddAdjustment(AdjustableProperty.Volume, volumeAdjustment);