sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 14:46:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Move logo colour definitions local to their usage.

Browse Source
This commit is contained in:
Dean Herbert
2017-01-27 17:57:52 +09:00
parent 9b2669e1ae
commit 6d44c5c8f1
2 changed files with 10 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -24,6 +24,8 @@ namespace osu.Game.Screens.Menu
/// </summary>
public partial class OsuLogo : Container
{
public Color4 OsuPink = OsuColour.FromHex(@"e967a1");
private Sprite logo;
private CircularContainer logoContainer;
private Container logoBounceContainer;
@ -107,6 +109,7 @@ namespace osu.Game.Screens.Menu
colourLayer = new Box
{
RelativeSizeAxes = Axes.Both,
Colour = OsuPink,
},
new OsuLogoTriangles
{
@ -163,10 +166,8 @@ namespace osu.Game.Screens.Menu
}
[BackgroundDependencyLoader]
private void load(TextureStore textures, OsuColour colour)
private void load(TextureStore textures)
{
colourLayer.Colour = colour.OsuPink;
logo.Texture = textures.Get(@"Menu/logo@2x");
ripple.Texture = textures.Get(@"Menu/logo@2x");
}
@ -221,22 +222,16 @@ namespace osu.Game.Screens.Menu
class OsuLogoTriangles : Triangles
{
private Color4 range1;
private Color4 range2;
public Color4 OsuPinkLight = OsuColour.FromHex(@"ff7db7");
public Color4 OsuPinkDark = OsuColour.FromHex(@"de5b95");
public OsuLogoTriangles()
{
TriangleScale = 4;
Alpha = 1;
}
[BackgroundDependencyLoader]
private void load(OsuColour colour)
{
range1 = colour.OsuPinkDark;
range2 = colour.OsuPinkLight;
}
protected override Triangle CreateTriangle()
{
var triangle = base.CreateTriangle();
@ -249,8 +244,8 @@ namespace osu.Game.Screens.Menu
{
float val = RNG.NextSingle();
return Interpolation.ValueAt(val,
range1,
range2,
OsuPinkDark,
OsuPinkLight,
0, 1);
}
}