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

Add constant for osu! playfield size.

Browse Source
This commit is contained in:
Dean Herbert 2017-04-18 12:19:39 +09:00
parent ef5d50e7d8
commit 2df21066e7
No known key found for this signature in database
GPG Key ID: 46D71BF4958ABB49
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs
View File

@ -45,7 +45,7 @@ namespace osu.Desktop.VisualTests.Tests
objects.Add(new HitCircle objects.Add(new HitCircle
{ {
StartTime = time, StartTime = time,
Position = new Vector2(RNG.Next(0, 512), RNG.Next(0, 384)), Position = new Vector2(RNG.Next(0, (int)OsuPlayfield.BASE_SIZE.X), RNG.Next(0, (int)OsuPlayfield.BASE_SIZE.Y)),
Scale = RNG.NextSingle(0.5f, 1.0f), Scale = RNG.NextSingle(0.5f, 1.0f),
}); });

5
osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
View File

@ -14,6 +14,7 @@ using osu.Game.Modes.Osu.Objects;
using osu.Game.Screens.Play; using osu.Game.Screens.Play;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Desktop.VisualTests.Beatmaps; using osu.Desktop.VisualTests.Beatmaps;
using osu.Game.Modes.Osu.UI;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
{ {
@ -52,8 +53,8 @@ namespace osu.Desktop.VisualTests.Tests
objects.Add(new HitCircle objects.Add(new HitCircle
{ {
StartTime = time, StartTime = time,
Position = new Vector2(i % 4 == 0 || i % 4 == 2 ? 0 : 512, Position = new Vector2(i % 4 == 0 || i % 4 == 2 ? 0 : OsuPlayfield.BASE_SIZE.X,
i % 4 < 2 ? 0 : 384), i % 4 < 2 ? 0 : OsuPlayfield.BASE_SIZE.Y),
NewCombo = i % 4 == 0 NewCombo = i % 4 == 0
}); });

3
osu.Game.Modes.Osu/Beatmaps/OsuBeatmapConverter.cs
View File

@ -10,6 +10,7 @@ using System.Collections.Generic;
using osu.Game.Modes.Objects.Types; using osu.Game.Modes.Objects.Types;
using System.Linq; using System.Linq;
using System; using System;
using osu.Game.Modes.Osu.UI;
using osu.Game.Modes.Beatmaps; using osu.Game.Modes.Beatmaps;
namespace osu.Game.Modes.Osu.Beatmaps namespace osu.Game.Modes.Osu.Beatmaps
@ -66,7 +67,7 @@ namespace osu.Game.Modes.Osu.Beatmaps
Samples = original.Samples, Samples = original.Samples,
EndTime = endTimeData.EndTime, EndTime = endTimeData.EndTime,
Position = positionData?.Position ?? new Vector2(512, 384) / 2, Position = positionData?.Position ?? OsuPlayfield.BASE_SIZE / 2,
}; };
} }

3
osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
View File

@ -9,6 +9,7 @@ using osu.Game.Modes.Objects.Drawables;
using osu.Game.Modes.Osu.Objects.Drawables.Pieces; using osu.Game.Modes.Osu.Objects.Drawables.Pieces;
using OpenTK; using OpenTK;
using OpenTK.Graphics; using OpenTK.Graphics;
using osu.Game.Modes.Osu.UI;
namespace osu.Game.Modes.Osu.Objects.Drawables namespace osu.Game.Modes.Osu.Objects.Drawables
{ {
@ -29,7 +30,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables
Position = s.Position; Position = s.Position;
//take up full playfield. //take up full playfield.
Size = new Vector2(512); Size = OsuPlayfield.BASE_SIZE;
spinner = s; spinner = s;

4
osu.Game.Modes.Osu/UI/OsuPlayfield.cs
View File

@ -23,6 +23,8 @@ namespace osu.Game.Modes.Osu.UI
public override bool ProvidingUserCursor => true; public override bool ProvidingUserCursor => true;
public static readonly Vector2 BASE_SIZE = new Vector2(512, 384);
public override Vector2 Size public override Vector2 Size
{ {
get get
@ -34,7 +36,7 @@ namespace osu.Game.Modes.Osu.UI
} }
} }
public OsuPlayfield() : base(512) public OsuPlayfield() : base(BASE_SIZE.X)
{ {
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;