1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-14 00:02:54 +08:00

Merge pull request #85 from Tom94/make_osu_logo_circular

Make osu logo circular
This commit is contained in:
Dean Herbert 2016-10-15 23:01:56 +09:00 committed by GitHub
commit 9cfafceb34
2 changed files with 9 additions and 3 deletions

@ -1 +1 @@
Subproject commit 3629521379bea5d79cd41e35ad6c6dfe21b4f9e7 Subproject commit cb420e7f7f4ef9cdda8ae8336d997946384d3732

View File

@ -8,6 +8,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Transformations; using osu.Framework.Graphics.Transformations;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework; using osu.Framework;
using OpenTK;
namespace osu.Game.GameModes.Menu namespace osu.Game.GameModes.Menu
{ {
@ -16,7 +17,7 @@ namespace osu.Game.GameModes.Menu
/// </summary> /// </summary>
public partial class OsuLogo : AutoSizeContainer public partial class OsuLogo : AutoSizeContainer
{ {
private Sprite logo; private SpriteCircular logo;
private Container logoBounceContainer; private Container logoBounceContainer;
private MenuVisualisation vis; private MenuVisualisation vis;
@ -37,6 +38,11 @@ namespace osu.Game.GameModes.Menu
} }
} }
public override bool Contains(Vector2 screenSpacePos)
{
return logo.Contains(screenSpacePos);
}
public bool Interactive = true; public bool Interactive = true;
public OsuLogo() public OsuLogo()
@ -50,7 +56,7 @@ namespace osu.Game.GameModes.Menu
{ {
Children = new Drawable[] Children = new Drawable[]
{ {
logo = new Sprite() logo = new SpriteCircular()
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre Origin = Anchor.Centre