h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 03:03:02 +08:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Graphics/OsuColour.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Graphics
public static Color4 Gray(float amt) => new Color4(amt, amt, amt, 1f);
public static Color4 Gray(byte amt) => new Color4(amt, amt, amt, 255);
private static Color4 FromHex(string hex)
public static Color4 FromHex(string hex)
{
return new Color4(
Convert.ToByte(hex.Substring(0, 2), 16),
@ -24,12 +24,6 @@ namespace osu.Game.Graphics
255);
}
//used for osu! logo and triangles contained within.
public Color4 OsuPink = FromHex(@"e967a1");
public Color4 OsuPinkLight = FromHex(@"ff7db7");
public Color4 OsuPinkDark= FromHex(@"de5b95");
// See https://github.com/ppy/osu-web/blob/master/resources/assets/less/colors.less
public Color4 PurpleLighter = FromHex(@"eeeeff");
public Color4 PurpleLight = FromHex(@"aa88ff");

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);
}
}