h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Code Issues Releases Wiki Activity

Merge pull request #89 from Tom94/round_masking

Browse Source 
Update framework.
This commit is contained in:
Dean Herbert 2016-10-17 12:11:23 +09:00 committed by GitHub
commit 3a77fc16c3
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 5dc6a02088d0fac39810fc2da26ac0de72551939
Subproject commit 852df4b405bf40cee0df8f0450a081fa657e7b43

24
osu.Game/GameModes/Menu/OsuLogo.cs
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
{