RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove need for waves array; use generic container.

This commit is contained in:
Dean Herbert 2017-02-23 11:26:50 +09:00
parent d154cf7938
commit 521a9b7728
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Overlays/WaveOverlayContainer.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System.Linq;
using OpenTK.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
@ -48,8 +49,9 @@ private float[] waveDurations
private const float third_wave_rotation = 4;
private const float fourth_wave_rotation = -2;
private Container firstWave, secondWave, thirdWave, fourthWave, wavesContainer;
private readonly Container[] waves;
private Wave firstWave, secondWave, thirdWave, fourthWave;
private Container<Wave> wavesContainer;
private readonly Container contentContainer;
protected override Container<Drawable> Content => contentContainer;
@ -118,9 +120,11 @@ protected override void PopIn()
{
base.Show();
for (int i = 0; i < waves.Length; i++)
int i = 0;
foreach (var w in wavesContainer.Children)
{
waves[i].MoveToY(wavePositions[i], waveDurations[i], EasingTypes.OutQuint);
w.MoveToY(wavePositions[i], waveDurations[i], EasingTypes.OutQuint);
i++;
}
DelayReset();
@ -149,10 +153,8 @@ protected override void PopOut()
contentContainer.MoveToY(DrawHeight, CONTENT_EXIT_DURATION, EasingTypes.InSine);
TransitionOut();
for (int i = 0; i < waves.Length; i++)
{
waves[i].MoveToY(DrawHeight, second_wave_duration, EasingTypes.InSine);
}
foreach (var w in wavesContainer.Children)
w.MoveToY(DrawHeight, second_wave_duration, EasingTypes.InSine);
DelayReset();
Delay(container_wait);
@ -171,12 +173,12 @@ public WaveOverlayContainer()
{
Masking = true;
AddInternal(wavesContainer = new Container
AddInternal(wavesContainer = new Container<Wave>
{
RelativeSizeAxes = Axes.Both,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Children = new Drawable[]
Children = new Wave[]
{
firstWave = new Wave
{
@ -220,8 +222,6 @@ public WaveOverlayContainer()
},
},
});
waves = new[] { firstWave, secondWave, thirdWave, fourthWave };
}
class Wave : Container