From 851ef4fbbf1fdccec9839c99d8b5c65893896ba9 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 11 Sep 2016 02:27:42 +0900 Subject: [PATCH] Framework updates. --- osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs | 2 +- osu.Game/GameModes/Play/HitRenderer.cs | 3 ++- osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs | 2 +- osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs | 3 ++- osu.Game/GameModes/Play/PlayTest.cs | 8 ++++---- osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs | 2 +- osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs b/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs index b398dcc194..86fa222541 100644 --- a/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs +++ b/osu.Game/GameModes/Play/Catch/CatchHitRenderer.cs @@ -72,7 +72,7 @@ namespace osu.Game.GameModes.Play.Catch Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) { Origin = Anchor.Centre, - Scale = 0.1f, + Scale = new Vector2(0.1f), PositionMode = InheritMode.Y, Position = new Vector2(h.Position, -0.1f) }; diff --git a/osu.Game/GameModes/Play/HitRenderer.cs b/osu.Game/GameModes/Play/HitRenderer.cs index dca6850ab4..e09fb0e923 100644 --- a/osu.Game/GameModes/Play/HitRenderer.cs +++ b/osu.Game/GameModes/Play/HitRenderer.cs @@ -7,6 +7,7 @@ using osu.Framework.Graphics.Batches; using osu.Framework.Graphics.Containers; using osu.Framework.Graphics.Drawables; using osu.Game.Beatmaps.Objects; +using OpenTK; namespace osu.Game.GameModes.Play { @@ -18,7 +19,7 @@ namespace osu.Game.GameModes.Play { base.Load(); - Add(new Box() { SizeMode = InheritMode.XY, Alpha = 0.1f, Scale = 0.99f }); + Add(new Box() { SizeMode = InheritMode.XY, Alpha = 0.1f, Scale = new Vector2(0.99f) }); } } } diff --git a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs b/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs index 85b3aef2f1..85715b37bb 100644 --- a/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs +++ b/osu.Game/GameModes/Play/Mania/ManiaHitRenderer.cs @@ -78,7 +78,7 @@ namespace osu.Game.GameModes.Play.Mania Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) { Origin = Anchor.Centre, - Scale = 0.1f, + Scale = new Vector2(0.1f), PositionMode = InheritMode.XY, Position = new Vector2((float)(h.Column + 0.5) / columns, -0.1f) }; diff --git a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs b/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs index b529efdc5a..8646e4a07c 100644 --- a/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs +++ b/osu.Game/GameModes/Play/Osu/OsuHitRenderer.cs @@ -7,6 +7,7 @@ using osu.Framework.Graphics; using osu.Framework.Graphics.Transformations; using osu.Game.Beatmaps.Objects; using osu.Game.Beatmaps.Objects.Osu; +using OpenTK; namespace osu.Game.GameModes.Play.Osu { @@ -49,7 +50,7 @@ namespace osu.Game.GameModes.Play.Osu Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) { Origin = Anchor.Centre, - Scale = 0.1f, + Scale = new Vector2(0.1f), Alpha = 0, Position = h.Position }; diff --git a/osu.Game/GameModes/Play/PlayTest.cs b/osu.Game/GameModes/Play/PlayTest.cs index 8d35b8f1fe..82ee295995 100644 --- a/osu.Game/GameModes/Play/PlayTest.cs +++ b/osu.Game/GameModes/Play/PlayTest.cs @@ -44,7 +44,7 @@ namespace osu.Game.GameModes.Play Add(new OsuHitRenderer() { Objects = beatmap.HitObjects, - Scale = 0.5f, + Scale = new Vector2(0.5f), Anchor = Anchor.TopLeft, Origin = Anchor.TopLeft }); @@ -52,7 +52,7 @@ namespace osu.Game.GameModes.Play Add(new TaikoHitRenderer() { Objects = beatmap.HitObjects, - Scale = 0.5f, + Scale = new Vector2(0.5f), Anchor = Anchor.TopRight, Origin = Anchor.TopRight }); @@ -60,7 +60,7 @@ namespace osu.Game.GameModes.Play Add(new CatchHitRenderer() { Objects = beatmap.HitObjects, - Scale = 0.5f, + Scale = new Vector2(0.5f), Anchor = Anchor.BottomLeft, Origin = Anchor.BottomLeft }); @@ -68,7 +68,7 @@ namespace osu.Game.GameModes.Play Add(new ManiaHitRenderer() { Objects = beatmap.HitObjects, - Scale = 0.5f, + Scale = new Vector2(0.5f), Anchor = Anchor.BottomRight, Origin = Anchor.BottomRight }); diff --git a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs b/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs index 576dbcf591..41b35bcb48 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoHitRenderer.cs @@ -71,7 +71,7 @@ namespace osu.Game.GameModes.Play.Taiko Sprite s = new Sprite(Game.Textures.Get(@"menu-osu")) { Origin = Anchor.Centre, - Scale = 0.2f, + Scale = new Vector2(0.2f), PositionMode = InheritMode.XY, Position = new Vector2(1.1f, 0.5f) }; diff --git a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs b/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs index 53121ec6ad..62f81224b5 100644 --- a/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs +++ b/osu.Game/GameModes/Play/Taiko/TaikoPlayfield.cs @@ -29,7 +29,7 @@ namespace osu.Game.GameModes.Play.Taiko Add(new Sprite(Game.Textures.Get(@"menu-osu")) { Origin = Anchor.Centre, - Scale = 0.2f, + Scale = new Vector2(0.2f), PositionMode = InheritMode.XY, Position = new Vector2(0.1f, 0.5f), Colour = Color4.Gray