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

Merge branch 'master' into replay

Browse Source 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
This commit is contained in:
Dean Herbert
2017-03-05 17:45:03 +09:00
parent 7a6a614358 a7d7abe70e
commit 4e4408cd20
96 changed files with 217 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,12 +3,12 @@
using osu.Framework;
using OpenTK.Graphics;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics.Containers;
using osu.Game.Graphics;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using OpenTK;
using osu.Framework.Graphics.Transforms;
using System;
namespace osu.Game.Overlays
{
@ -86,9 +86,10 @@ namespace osu.Game.Overlays
AddInternal(wavesContainer = new Container<Wave>
{
RelativeSizeAxes = Axes.Both,
RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre,
Anchor = Anchor.TopCentre,
Masking = true,
Children = new[]
{
firstWave = new Wave
@ -152,14 +153,23 @@ namespace osu.Game.Overlays
FadeOut(DISAPPEAR_DURATION, EasingTypes.InQuint);
}
protected override void UpdateAfterChildren()
{
base.UpdateAfterChildren();
// This is done as an optimization, such that invisible parts of the waves
// are masked away, and thus do not consume fill rate.
wavesContainer.Height = Math.Max(0, DrawHeight - (contentContainer.DrawHeight - contentContainer.Y));
}
private class Wave : Container, IStateful<Visibility>
{
public float FinalPosition;
public Wave()
{
RelativeSizeAxes = Axes.Both;
Size = new Vector2(1.5f);
RelativeSizeAxes = Axes.X;
Width = 1.5f;
Masking = true;
EdgeEffect = new EdgeEffect
{
@ -177,6 +187,15 @@ namespace osu.Game.Overlays
};
}
protected override void Update()
{
base.Update();
// We can not use RelativeSizeAxes for Height, because the height
// of our parent diminishes as the content moves up.
Height = Parent.Parent.DrawSize.Y * 1.5f;
}
private Visibility state;
public Visibility State
{
@ -188,7 +207,7 @@ namespace osu.Game.Overlays
switch (value)
{
case Visibility.Hidden:
MoveToY(DrawHeight / Height, DISAPPEAR_DURATION, easing_hide);
MoveToY(Parent.Parent.DrawSize.Y, DISAPPEAR_DURATION, easing_hide);
break;
case Visibility.Visible:
MoveToY(FinalPosition, APPEAR_DURATION, easing_show);