1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-29 06:09:59 +08:00

Merge pull request #89 from Tom94/round_masking

Update framework.
This commit is contained in:
Dean Herbert
2016-10-17 12:11:23 +09:00
committed by GitHub
Unverified
2 changed files with 17 additions and 9 deletions
+16 -8
View File
@@ -17,7 +17,8 @@ namespace osu.Game.GameModes.Menu
/// </summary>
public partial class OsuLogo : AutoSizeContainer
{
private SpriteCircular logo;
private Sprite logo;
private CircularContainer logoContainer;
private Container logoBounceContainer;
private MenuVisualisation vis;
@@ -29,6 +30,11 @@ namespace osu.Game.GameModes.Menu
private Container rippleContainer;
public override bool Contains(Vector2 screenSpacePos)
{
return logoContainer.Contains(screenSpacePos);
}
public bool Ripple
{
get { return rippleContainer.Alpha > 0; }
@@ -38,11 +44,6 @@ namespace osu.Game.GameModes.Menu
}
}
public override bool Contains(Vector2 screenSpacePos)
{
return logo.Contains(screenSpacePos);
}
public bool Interactive = true;
public OsuLogo()
@@ -56,10 +57,17 @@ namespace osu.Game.GameModes.Menu
{
Children = new Drawable[]
{
logo = new SpriteCircular()
logoContainer = new CircularContainer
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
Children = new[]
{
logo = new Sprite
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
},
},
},
rippleContainer = new Container
{