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

Use a grid container to position the stages

Browse Source 
Should be more flexible in the future + provides a more dual-stage feel.
This commit is contained in:
smoogipoo 2018-01-15 19:55:15 +09:00
parent 28586317dd
commit 39b6425c3e
1 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
View File

@ -3,13 +3,11 @@
using osu.Framework.Graphics;
using osu.Game.Rulesets.Mania.Objects;
using OpenTK;
using osu.Framework.Graphics.Containers;
using System;
using System.Collections.Generic;
using System.Linq;
using osu.Framework.Configuration;
using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI.Scrolling;
@ -18,11 +16,6 @@ namespace osu.Game.Rulesets.Mania.UI
{
public class ManiaPlayfield : ScrollingPlayfield
{
/// <summary>
/// <see cref="ManiaStage"/>s contained by this <see cref="ManiaPlayfield"/>.
/// </summary>
private readonly FillFlowContainer<ManiaStage> stages;
/// <summary>
/// Whether this playfield should be inverted. This flips everything inside the playfield.
/// </summary>
@ -34,6 +27,7 @@ namespace osu.Game.Rulesets.Mania.UI
public Bindable<SpecialColumnPosition> SpecialColumnPosition = new Bindable<SpecialColumnPosition>();
public List<Column> Columns => stages.SelectMany(x => x.Columns).ToList();
private readonly List<ManiaStage> stages = new List<ManiaStage>();
public ManiaPlayfield(List<StageDefinition> stageDefinitions)
: base(ScrollingDirection.Up)
@ -46,20 +40,11 @@ namespace osu.Game.Rulesets.Mania.UI
Inverted.Value = true;
var stageSpacing = 300 / stageDefinitions.Count;
InternalChildren = new Drawable[]
GridContainer playfieldGrid;
InternalChild = playfieldGrid = new GridContainer
{
stages = new FillFlowContainer<ManiaStage>
{
Name = "Stages",
Direction = FillDirection.Horizontal,
RelativeSizeAxes = Axes.Y,
AutoSizeAxes = Axes.X,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Spacing = new Vector2(stageSpacing),
}
RelativeSizeAxes = Axes.Both,
Content = new[] { new Drawable[stageDefinitions.Count] }
};
int firstColumnIndex = 0;
@ -70,6 +55,8 @@ namespace osu.Game.Rulesets.Mania.UI
newStage.VisibleTimeRange.BindTo(VisibleTimeRange);
newStage.Inverted.BindTo(Inverted);
playfieldGrid.Content[0][i] = newStage;
stages.Add(newStage);
AddNested(newStage);