h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-26 21:03:21 +08:00
Code Issues Releases Wiki Activity

Simplify + rename playfield layers in Osu/Catch

Browse Source
This commit is contained in:
smoogipoo 2018-09-21 15:01:58 +09:00
parent a166d03ede
commit 26094ea325
3 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Catch.UI
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
FillAspectRatio = 4f / 3, FillAspectRatio = 4f / 3,
Child = new ScalingContainer(BASE_WIDTH) Child = new PlayfieldLayer
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Children = new Drawable[] Children = new Drawable[]

14
osu.Game.Rulesets.Catch/UI/ScalingContainer.cs → osu.Game.Rulesets.Catch/UI/PlayfieldLayer.cs
View File

@ -6,23 +6,13 @@ using OpenTK;
namespace osu.Game.Rulesets.Catch.UI namespace osu.Game.Rulesets.Catch.UI
{ {
/// <summary> public class PlayfieldLayer : Container
/// A <see cref="Container"/> which scales its content relative to a target width.
/// </summary>
public class ScalingContainer : Container
{ {
private readonly float targetWidth;
public ScalingContainer(float targetWidth)
{
this.targetWidth = targetWidth;
}
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
Scale = new Vector2(Parent.ChildSize.X / targetWidth); Scale = new Vector2(Parent.ChildSize.X / CatchPlayfield.BASE_WIDTH);
Size = Vector2.Divide(Vector2.One, Scale); Size = Vector2.Divide(Vector2.One, Scale);
} }
} }

11
osu.Game.Rulesets.Osu/UI/PlayfieldLayer.cs
View File

@ -21,7 +21,7 @@ namespace osu.Game.Rulesets.Osu.UI
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
FillAspectRatio = 4f / 3, FillAspectRatio = 4f / 3,
Child = content = new ScalingContainer(OsuPlayfield.BASE_SIZE.X) { RelativeSizeAxes = Axes.Both } Child = content = new ScalingContainer { RelativeSizeAxes = Axes.Both }
}; };
} }
@ -30,18 +30,11 @@ namespace osu.Game.Rulesets.Osu.UI
/// </summary> /// </summary>
private class ScalingContainer : Container private class ScalingContainer : Container
{ {
private readonly float targetWidth;
public ScalingContainer(float targetWidth)
{
this.targetWidth = targetWidth;
}
protected override void Update() protected override void Update()
{ {
base.Update(); base.Update();
Scale = new Vector2(Parent.ChildSize.X / targetWidth); Scale = new Vector2(Parent.ChildSize.X / OsuPlayfield.BASE_SIZE.X);
Size = Vector2.Divide(Vector2.One, Scale); Size = Vector2.Divide(Vector2.One, Scale);
} }
} }