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

Changes in-line with framework

Browse Source
This commit is contained in:
ColdVolcano 2017-05-21 23:47:08 -05:00
parent 38a566890f
commit 059af0850b
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Timing; using osu.Game.Beatmaps.Timing;
using System; using System;
using osu.Framework.Audio.Track;
namespace osu.Game.Screens.Menu namespace osu.Game.Screens.Menu
{ {
@ -23,8 +24,8 @@ namespace osu.Game.Screens.Menu
private Box leftBox; private Box leftBox;
private Box rightBox; private Box rightBox;
private const int amplitude_dead_zone = 9000; private const float amplitude_dead_zone = 0.25f;
private const float alpha_multiplier = (short.MaxValue - amplitude_dead_zone) / 0.55f; private const float alpha_multiplier = (1 - amplitude_dead_zone) / 0.55f;
private const int box_max_alpha = 200; private const int box_max_alpha = 200;
private const double box_fade_in_time = 65; private const double box_fade_in_time = 65;
@ -68,12 +69,13 @@ namespace osu.Game.Screens.Menu
} }
else if (newBeat >= 0) else if (newBeat >= 0)
{ {
short[] lev = beatmap.Value.Track.ChannelPeakAmplitudes;
TrackAmplitudes amp = beatmap.Value.Track.PeakAmplitudes;
bool nextIsLeft = newBeat % 2 == 0; bool nextIsLeft = newBeat % 2 == 0;
if (kiai ? nextIsLeft : newBeat % (int)timeSignature == 0) if (kiai ? nextIsLeft : newBeat % (int)timeSignature == 0)
{ {
leftBox.ClearTransforms(); leftBox.ClearTransforms();
leftBox.FadeTo(Math.Max(0, (lev[0] - amplitude_dead_zone) / alpha_multiplier), 65); leftBox.FadeTo(Math.Max(0, (amp.LeftChannel - amplitude_dead_zone) / alpha_multiplier), 65);
using (leftBox.BeginDelayedSequence(box_fade_in_time)) using (leftBox.BeginDelayedSequence(box_fade_in_time))
leftBox.FadeOut(beatLength, EasingTypes.In); leftBox.FadeOut(beatLength, EasingTypes.In);
leftBox.DelayReset(); leftBox.DelayReset();
@ -81,7 +83,7 @@ namespace osu.Game.Screens.Menu
if (kiai ? !nextIsLeft : newBeat % (int)timeSignature == 0) if (kiai ? !nextIsLeft : newBeat % (int)timeSignature == 0)
{ {
rightBox.ClearTransforms(); rightBox.ClearTransforms();
rightBox.FadeTo(Math.Max(0, (lev[1] - amplitude_dead_zone) / alpha_multiplier), 65); rightBox.FadeTo(Math.Max(0, (amp.LeftChannel - amplitude_dead_zone) / alpha_multiplier), 65);
using (rightBox.BeginDelayedSequence(box_fade_in_time)) using (rightBox.BeginDelayedSequence(box_fade_in_time))
rightBox.FadeOut(beatLength, EasingTypes.In); rightBox.FadeOut(beatLength, EasingTypes.In);
rightBox.DelayReset(); rightBox.DelayReset();