From f1688499e41bb76b926c5c748f3601595f608c12 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Wed, 21 Sep 2016 13:12:05 +0900 Subject: [PATCH] Bring framework up-to-date. --- osu-framework | 2 +- osu.Game/GameModes/Menu/ButtonSystem.cs | 10 ++++++---- osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs | 3 ++- osu.Game/GameModes/Play/Catch/CatchPlayfield.cs | 2 +- osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs | 3 ++- osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs | 3 ++- osu.Game/GameModes/Play/Playfield.cs | 7 +------ osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs | 3 ++- osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs | 5 +++-- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/osu-framework b/osu-framework index 0ca3fe2b5d..556bf7e3c1 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 0ca3fe2b5d20f9aa71ef8a65cd9a676d5d3035e3 +Subproject commit 556bf7e3c1f50cac0b9924300eaf97ecae4aece7 diff --git a/osu.Game/GameModes/Menu/ButtonSystem.cs b/osu.Game/GameModes/Menu/ButtonSystem.cs index 75fec4bdbf..b4cbb9cf96 100644 --- a/osu.Game/GameModes/Menu/ButtonSystem.cs +++ b/osu.Game/GameModes/Menu/ButtonSystem.cs @@ -298,14 +298,16 @@ namespace osu.Game.GameModes.Menu { Children = new Drawable[] { - logo = new Sprite(Game.Textures.Get(@"menu-osu")) + logo = new Sprite { - Anchor = Anchor.Centre, + Texture = Game.Textures.Get(@"menu-osu"), + Anchor = Anchor.Centre, Origin = Anchor.Centre }, - ripple = new Sprite(Game.Textures.Get(@"menu-osu")) + ripple = new Sprite { - Anchor = Anchor.Centre, + Texture = Game.Textures.Get(@"menu-osu"), + Anchor = Anchor.Centre, Origin = Anchor.Centre, Alpha = 0.4f }, diff --git a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs b/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs index 86fa222541..76580826b0 100644 --- a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs +++ b/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs @@ -69,8 +69,9 @@ namespace osu.Game.GameModes.Play.Catch foreach (CatchBaseHit h in objects) { //render stuff! - Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) + Sprite s = new Sprite { + Texture = Game.Textures.Get(@"menu-osu"), Origin = Anchor.Centre, Scale = new Vector2(0.1f), PositionMode = InheritMode.Y, diff --git a/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs b/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs index 74721233c3..5f148f7606 100644 --- a/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs +++ b/osu.Game/GameModes/Play/Catch/CatchPlayfield.cs @@ -24,7 +24,7 @@ namespace osu.Game.GameModes.Play.Catch { base.Load(); - Add(new Box() { SizeMode = InheritMode.XY, Alpha = 0.5f }); + Add(new Box { SizeMode = InheritMode.XY, Alpha = 0.5f }); } } } \ No newline at end of file diff --git a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs b/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs index 85715b37bb..44e0bb53c8 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs +++ b/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs @@ -75,8 +75,9 @@ namespace osu.Game.GameModes.Play.Mania foreach (ManiaBaseHit h in objects) { //render stuff! - Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) + Sprite s = new Sprite { + Texture = Game.Textures.Get(@"menu-osu"), Origin = Anchor.Centre, Scale = new Vector2(0.1f), PositionMode = InheritMode.XY, diff --git a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs b/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs index 8646e4a07c..7754e3976d 100644 --- a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs +++ b/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs @@ -47,8 +47,9 @@ namespace osu.Game.GameModes.Play.Osu foreach (OsuBaseHit h in objects) { //render stuff! - Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) + Sprite s = new Sprite { + Texture = Game.Textures.Get(@"menu-osu"), Origin = Anchor.Centre, Scale = new Vector2(0.1f), Alpha = 0, diff --git a/osu.Game/GameModes/Play/Playfield.cs b/osu.Game/GameModes/Play/Playfield.cs index 7503731ff0..331ce41f7a 100644 --- a/osu.Game/GameModes/Play/Playfield.cs +++ b/osu.Game/GameModes/Play/Playfield.cs @@ -1,16 +1,11 @@ //Copyright (c) 2007-2016 ppy Pty Ltd . //Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using osu.Framework.Graphics.Containers; namespace osu.Game.GameModes.Play { - public class Playfield : MaskingContainer + public class Playfield : Container { } } diff --git a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs b/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs index 41b35bcb48..a5958f7bc1 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs @@ -68,8 +68,9 @@ namespace osu.Game.GameModes.Play.Taiko foreach (TaikoBaseHit h in objects) { //render stuff! - Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) + Sprite s = new Sprite { + Texture = Game.Textures.Get(@"menu-osu"), Origin = Anchor.Centre, Scale = new Vector2(0.2f), PositionMode = InheritMode.XY, diff --git a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs b/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs index 62f81224b5..03c33c2c9b 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs @@ -24,10 +24,11 @@ namespace osu.Game.GameModes.Play.Taiko { base.Load(); - Add(new Box() { SizeMode = InheritMode.XY, Alpha = 0.5f }); + Add(new Box { SizeMode = InheritMode.XY, Alpha = 0.5f }); - Add(new Sprite(Game.Textures.Get(@"menu-osu")) + Add(new Sprite { + Texture = Game.Textures.Get(@"menu-osu"), Origin = Anchor.Centre, Scale = new Vector2(0.2f), PositionMode = InheritMode.XY,