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

Move BufferedContainer usage to allow ripple to blend correctly with the background layer.

This commit is contained in:
Dean Herbert 2016-12-01 21:29:14 +09:00
parent 511dab32ef
commit 2342a17dbc
1 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@ namespace osu.Game.Screens.Menu
/// <summary>
/// osu! logo and its attachments (pulsing, visualiser etc.)
/// </summary>
public partial class OsuLogo : BufferedContainer
public partial class OsuLogo : Container
{
private Sprite logo;
private CircularContainer logoContainer;
@ -82,39 +82,46 @@ public OsuLogo()
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
logoContainer = new CircularContainer
new BufferedContainer
{
Anchor = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Scale = new Vector2(0.8f),
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
colourAndTriangles = new Container
logoContainer = new CircularContainer
{
RelativeSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both,
Scale = new Vector2(0.8f),
Children = new Drawable[]
{
new Box
colourAndTriangles = new Container
{
RelativeSizeAxes = Axes.Both,
Colour = new Color4(233, 103, 161, 255),
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = new Color4(233, 103, 161, 255),
},
new OsuLogoTriangles
{
RelativeSizeAxes = Axes.Both,
},
}
},
new OsuLogoTriangles
{
RelativeSizeAxes = Axes.Both,
},
}
},
},
},
logo = new Sprite
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(0.5f),
},
},
logo = new Sprite
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Scale = new Vector2(0.5f),
},
}
},
rippleContainer = new Container
{
@ -128,7 +135,7 @@ public OsuLogo()
Origin = Anchor.Centre,
BlendingMode = BlendingMode.Additive,
Scale = new Vector2(0.5f),
Alpha = 0.05f
Alpha = 0.15f
}
}
},