h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-13 08:32:57 +08:00
Code Issues Releases Wiki Activity

Make the column background follow the scroll direction

Browse Source
This commit is contained in:
smoogipoo 2018-06-07 20:49:06 +09:00
parent 45dca56461
commit 4af8baefc1
3 changed files with 147 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
osu.Game.Rulesets.Mania.Tests/TestCaseColumn.cs
View File

@ -1,10 +1,16 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using System;
using System.Collections.Generic;
using NUnit.Framework;
using osu.Framework.Graphics;
using osu.Framework.Allocation;
using osu.Framework.Graphics.Containers;
using osu.Game.Rulesets.Mania.UI;
using osu.Game.Rulesets.Mania.UI.Components;
using osu.Game.Rulesets.UI.Scrolling;
using OpenTK;
using OpenTK.Graphics;
namespace osu.Game.Rulesets.Mania.Tests
@ -12,22 +18,41 @@ namespace osu.Game.Rulesets.Mania.Tests
[TestFixture]
public class TestCaseColumn : ManiaInputTestCase
{
public override IReadOnlyList<Type> RequiredTypes => new[]
{
typeof(Column),
typeof(ColumnBackground)
};
public TestCaseColumn()
: base(1)
: base(2)
{
}
[BackgroundDependencyLoader]
private void load()
{
Child = new Column
Child = new FillFlowContainer
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Height = 0.85f,
AccentColour = Color4.OrangeRed,
Action = ManiaAction.Special1
Spacing = new Vector2(20, 0),
Children = new[]
{
createColumn(ScrollingDirection.Up, ManiaAction.Key1),
createColumn(ScrollingDirection.Down, ManiaAction.Key2)
}
};
}
private Column createColumn(ScrollingDirection direction, ManiaAction action) => new Column(direction)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Height = 0.85f,
AccentColour = Color4.OrangeRed,
Action = action
};
}
}

32
osu.Game.Rulesets.Mania/UI/Column.cs
View File

@ -14,6 +14,7 @@ using System;
using System.Linq;
using osu.Framework.Input.Bindings;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.UI.Components;
using osu.Game.Rulesets.UI.Scrolling;
namespace osu.Game.Rulesets.Mania.UI
@ -32,8 +33,7 @@ namespace osu.Game.Rulesets.Mania.UI
public ManiaAction Action;
private readonly Box background;
private readonly Box backgroundOverlay;
private readonly ColumnBackground background;
private readonly Container hitTargetBar;
private readonly Container keyIcon;
@ -43,8 +43,8 @@ namespace osu.Game.Rulesets.Mania.UI
protected override Container<Drawable> Content => content;
private readonly Container<Drawable> content;
public Column()
: base(ScrollingDirection.Up)
public Column(ScrollingDirection direction = ScrollingDirection.Up)
: base(direction)
{
RelativeSizeAxes = Axes.Y;
Width = column_width;
@ -54,22 +54,7 @@ namespace osu.Game.Rulesets.Mania.UI
InternalChildren = new Drawable[]
{
background = new Box
{
Name = "Background",
RelativeSizeAxes = Axes.Both,
Alpha = 0.3f
},
backgroundOverlay = new Box
{
Name = "Background Gradient Overlay",
RelativeSizeAxes = Axes.Both,
Height = 0.5f,
Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft,
Blending = BlendingMode.Additive,
Alpha = 0
},
background = new ColumnBackground(direction) { RelativeSizeAxes = Axes.Both },
new Container
{
Name = "Hit target + hit objects",
@ -192,8 +177,7 @@ namespace osu.Game.Rulesets.Mania.UI
return;
accentColour = value;
background.Colour = accentColour;
backgroundOverlay.Colour = ColourInfo.GradientVertical(accentColour.Opacity(0.6f), accentColour.Opacity(0));
background.AccentColour = value;
hitTargetBar.EdgeEffect = new EdgeEffectParameters
{
@ -235,7 +219,7 @@ namespace osu.Game.Rulesets.Mania.UI
{
if (action == Action)
{
backgroundOverlay.FadeTo(1, 50, Easing.OutQuint).Then().FadeTo(0.5f, 250, Easing.OutQuint);
background.IsLit = true;
keyIcon.ScaleTo(1.4f, 50, Easing.OutQuint).Then().ScaleTo(1.3f, 250, Easing.OutQuint);
}
@ -246,7 +230,7 @@ namespace osu.Game.Rulesets.Mania.UI
{
if (action == Action)
{
backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
background.IsLit = false;
keyIcon.ScaleTo(1f, 125, Easing.OutQuint);
}

109
osu.Game.Rulesets.Mania/UI/Components/ColumnBackground.cs Normal file
View File

@ -0,0 +1,109 @@
// Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics;
using osu.Game.Rulesets.UI.Scrolling;
using OpenTK.Graphics;
namespace osu.Game.Rulesets.Mania.UI.Components
{
public class ColumnBackground : CompositeDrawable, IHasAccentColour
{
private readonly ScrollingDirection direction;
public ColumnBackground(ScrollingDirection direction)
{
this.direction = direction;
}
private Box background;
private Box backgroundOverlay;
[BackgroundDependencyLoader]
private void load()
{
InternalChildren = new[]
{
background = new Box
{
Name = "Background",
RelativeSizeAxes = Axes.Both,
Alpha = 0.3f
},
backgroundOverlay = new Box
{
Name = "Background Gradient Overlay",
RelativeSizeAxes = Axes.Both,
Height = 0.5f,
Anchor = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
Origin = direction == ScrollingDirection.Up ? Anchor.TopLeft : Anchor.BottomLeft,
Blending = BlendingMode.Additive,
Alpha = 0
}
};
}
protected override void LoadComplete()
{
base.LoadComplete();
updateColours();
}
private Color4 accentColour;
public Color4 AccentColour
{
get => accentColour;
set
{
if (accentColour == value)
return;
accentColour = value;
updateColours();
}
}
private void updateColours()
{
if (!IsLoaded)
return;
background.Colour = AccentColour;
var brightPoint = AccentColour.Opacity(0.6f);
var dimPoint = AccentColour.Opacity(0);
backgroundOverlay.Colour = ColourInfo.GradientVertical(
direction == ScrollingDirection.Up ? brightPoint : dimPoint,
direction == ScrollingDirection.Up ? dimPoint : brightPoint);
}
private bool isLit;
/// <summary>
/// Whether the column lighting should be visible.
/// </summary>
public bool IsLit
{
set
{
if (isLit == value)
return;
isLit = value;
if (isLit)
backgroundOverlay.FadeTo(1, 50, Easing.OutQuint).Then().FadeTo(0.5f, 250, Easing.OutQuint);
else
backgroundOverlay.FadeTo(0, 250, Easing.OutQuint);
}
}
}
}