h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 00:42:55 +08:00
Code Issues Releases Wiki Activity

Update to new syntax of OnNewBeat

Browse Source
This commit is contained in:
ColdVolcano 2017-05-23 20:01:20 -05:00
parent c6d744eb7c
commit 207d6e4ac3
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Screens/Menu/MenuSideFlashes.cs
View File

@ -3,17 +3,17 @@
using OpenTK.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Audio.Track;
using osu.Framework.Configuration;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Game.Graphics.Containers;
using osu.Framework.Graphics.Sprites;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Timing;
using System;
using osu.Game.Beatmaps.ControlPoints;
using osu.Game.Graphics;
using TrackAmplitudes = osu.Framework.Audio.Track.Track.TrackAmplitudes;
using osu.Game.Graphics.Containers;
using System;
namespace osu.Game.Screens.Menu
{
@ -75,22 +75,20 @@ namespace osu.Game.Screens.Menu
rightBox.ColourInfo = ColourInfo.GradientHorizontal(gradientDark, gradientLight);
}
protected override void OnNewBeat(int newBeat, double beatLength, TimeSignatures timeSignature, bool kiai)
protected override void OnNewBeat(int beatIndex, TimingControlPoint timingPoint, EffectControlPoint effectPoint, TrackAmplitudes amplitudes)
{
if (newBeat < 0)
if (beatIndex < 0)
return;
if (kiai ? newBeat % 2 == 0 : newBeat % (int)timeSignature == 0)
flash(leftBox, beatLength, kiai);
if (kiai ? newBeat % 2 == 1 : newBeat % (int)timeSignature == 0)
flash(rightBox, beatLength, kiai);
if (effectPoint.KiaiMode ? beatIndex % 2 == 0 : beatIndex % (int)timingPoint.TimeSignature == 0)
flash(leftBox, timingPoint.BeatLength, effectPoint.KiaiMode, amplitudes);
if (effectPoint.KiaiMode ? beatIndex % 2 == 1 : beatIndex % (int)timingPoint.TimeSignature == 0)
flash(rightBox, timingPoint.BeatLength, effectPoint.KiaiMode, amplitudes);
}
private void flash(Drawable d, double beatLength, bool kiai)
private void flash(Drawable d, double beatLength, bool kiai, TrackAmplitudes amplitudes)
{
TrackAmplitudes amp = beatmap.Value.Track.CurrentAmplitudes;
d.FadeTo(Math.Max(0, ((d.Equals(leftBox) ? amp.LeftChannel : amp.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time);
d.FadeTo(Math.Max(0, ((d.Equals(leftBox) ? amplitudes.LeftChannel : amplitudes.RightChannel) - amplitude_dead_zone) / (kiai ? kiai_multiplier : alpha_multiplier)), box_fade_in_time);
using (d.BeginDelayedSequence(box_fade_in_time))
d.FadeOut(beatLength, EasingTypes.In);
}