sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-06-08 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Refactor column construction

Browse Source
This commit is contained in:
smoogipoo 2018-01-15 18:11:53 +09:00
parent dd67070b6f
commit 89c3fcbf6a
2 changed files with 43 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,11 +39,11 @@ namespace osu.Game.Rulesets.Mania.UI
public ManiaPlayfield(List<StageDefinition> stageDefinition) public ManiaPlayfield(List<StageDefinition> stageDefinition)
: base(ScrollingDirection.Up) : base(ScrollingDirection.Up)
{ {
if (stageDefinition ==null) if (stageDefinition == null)
throw new ArgumentNullException(); throw new ArgumentNullException(nameof(stageDefinition));
if (stageDefinition.Count <= 0) if (stageDefinition.Count <= 0)
throw new ArgumentException("Can't have zero or fewer columns."); throw new ArgumentException("Can't have zero or fewer stages.");
Inverted.Value = true; Inverted.Value = true;
@ -62,32 +62,18 @@ namespace osu.Game.Rulesets.Mania.UI
} }
}; };
var currentAction = ManiaAction.Key1; int firstColumnIndex = 0;
for (int i = 0; i < stageDefinition.Count; i++)
int stageIndex = 0;
foreach (var stage in stageDefinition)
{ {
var drawableStage = new ManiaStage(); var newStage = new ManiaStage(i, firstColumnIndex, stageDefinition[i]);
drawableStage.SpecialColumn.BindTo(SpecialColumnPosition); newStage.SpecialColumn.BindTo(SpecialColumnPosition);
drawableStage.VisibleTimeRange.BindTo(VisibleTimeRange); newStage.VisibleTimeRange.BindTo(VisibleTimeRange);
drawableStage.Inverted.BindTo(Inverted); newStage.Inverted.BindTo(Inverted);
drawableStage.ColumnStartIndex = stageIndex;
stages.Add(drawableStage); stages.Add(newStage);
AddNested(drawableStage); AddNested(newStage);
for (int i = 0; i < stage.Columns; i++) firstColumnIndex += newStage.Columns.Count;
{
var c = new Column
{
//c.Action = c.IsSpecial ? ManiaAction.Special : currentAction++;
Action = currentAction++
};
drawableStage.AddColumn(c);
}
stageIndex = stageIndex + stage.Columns;
} }
} }
@ -95,7 +81,7 @@ namespace osu.Game.Rulesets.Mania.UI
{ {
var maniaObject = (ManiaHitObject)judgedObject.HitObject; var maniaObject = (ManiaHitObject)judgedObject.HitObject;
int column = maniaObject.Column; int column = maniaObject.Column;
getStageByColumn(column).AddJudgement(judgedObject,judgement); getStageByColumn(column).AddJudgement(judgedObject, judgement);
} }
public override void Add(DrawableHitObject h) public override void Add(DrawableHitObject h)
@ -118,7 +104,7 @@ namespace osu.Game.Rulesets.Mania.UI
int sum = 0; int sum = 0;
foreach (var stage in stages) foreach (var stage in stages)
{ {
sum = sum + stage.Columns.Count(); sum = sum + stage.Columns.Count;
if (sum > column) if (sum > column)
{ {
return stage; return stage;

52
osu.Game.Rulesets.Mania/UI/ManiaStage.cs
View File

@ -11,6 +11,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics; using osu.Game.Graphics;
using osu.Game.Rulesets.Judgements; using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
@ -33,8 +34,8 @@ namespace osu.Game.Rulesets.Mania.UI
public readonly Bindable<SpecialColumnPosition> SpecialColumn = new Bindable<SpecialColumnPosition>(); public readonly Bindable<SpecialColumnPosition> SpecialColumn = new Bindable<SpecialColumnPosition>();
public IEnumerable<Column> Columns => columns.Children; public IReadOnlyList<Column> Columns => columnFlow.Children;
private readonly FillFlowContainer<Column> columns; private readonly FillFlowContainer<Column> columnFlow;
protected override Container<Drawable> Content => content; protected override Container<Drawable> Content => content;
private readonly Container<Drawable> content; private readonly Container<Drawable> content;
@ -47,11 +48,17 @@ namespace osu.Game.Rulesets.Mania.UI
private List<Color4> normalColumnColours = new List<Color4>(); private List<Color4> normalColumnColours = new List<Color4>();
private Color4 specialColumnColour; private Color4 specialColumnColour;
public int ColumnStartIndex; private readonly int stageIndex;
private readonly int firstColumnIndex;
private readonly StageDefinition definition;
public ManiaStage() public ManiaStage(int stageIndex, int firstColumnIndex, StageDefinition definition)
: base(ScrollingDirection.Up) : base(ScrollingDirection.Up)
{ {
this.stageIndex = stageIndex;
this.firstColumnIndex = firstColumnIndex;
this.definition = definition;
Name = "Playfield elements"; Name = "Playfield elements";
Anchor = Anchor.Centre; Anchor = Anchor.Centre;
Origin = Anchor.Centre; Origin = Anchor.Centre;
@ -79,7 +86,7 @@ namespace osu.Game.Rulesets.Mania.UI
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Colour = new Color4(0, 0, 0, 0.8f) Colour = new Color4(0, 0, 0, 0.8f)
}, },
columns = new FillFlowContainer<Column> columnFlow = new FillFlowContainer<Column>
{ {
Name = "Columns", Name = "Columns",
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
@ -121,6 +128,9 @@ namespace osu.Game.Rulesets.Mania.UI
} }
}; };
for (int i = 0; i < definition.Columns; i++)
AddColumn(new Column());
Inverted.ValueChanged += invertedChanged; Inverted.ValueChanged += invertedChanged;
Inverted.TriggerChange(); Inverted.TriggerChange();
} }
@ -134,15 +144,17 @@ namespace osu.Game.Rulesets.Mania.UI
public void AddColumn(Column c) public void AddColumn(Column c)
{ {
c.VisibleTimeRange.BindTo(VisibleTimeRange); c.VisibleTimeRange.BindTo(VisibleTimeRange);
topLevelContainer.Add(c.TopLevelContainer.CreateProxy()); topLevelContainer.Add(c.TopLevelContainer.CreateProxy());
columns.Add(c); columnFlow.Add(c);
AddNested(c); AddNested(c);
Margin = new MarginPadding c.IsSpecial = isSpecialColumn(Columns.Count - 1);
{
Left = columns.Count * HIT_TARGET_POSITION / 2, if (c.IsSpecial)
Right = columns.Count * HIT_TARGET_POSITION / 2, c.Action = ManiaAction.Special1 + stageIndex;
}; else
c.Action = ManiaAction.Key1 + firstColumnIndex + Columns.Count - 1;
} }
/// <summary> /// <summary>
@ -156,25 +168,25 @@ namespace osu.Game.Rulesets.Mania.UI
{ {
default: default:
case SpecialColumnPosition.Normal: case SpecialColumnPosition.Normal:
return columns.Count % 2 == 1 && column == columns.Count / 2; return definition.Columns % 2 == 1 && column == definition.Columns / 2;
case SpecialColumnPosition.Left: case SpecialColumnPosition.Left:
return column == 0; return column == 0;
case SpecialColumnPosition.Right: case SpecialColumnPosition.Right:
return column == columns.Count - 1; return column == definition.Columns - 1;
} }
} }
public override void Add(DrawableHitObject h) public override void Add(DrawableHitObject h)
{ {
int columnIndex = ((ManiaHitObject)h.HitObject).Column - ColumnStartIndex; int columnIndex = ((ManiaHitObject)h.HitObject).Column - firstColumnIndex;
Columns.ElementAt(columnIndex).Add(h); Columns.ElementAt(columnIndex).Add(h);
} }
public void AddJudgement(DrawableHitObject judgedObject, Judgement judgement) public void AddJudgement(DrawableHitObject judgedObject, Judgement judgement)
{ {
var maniaObject = (ManiaHitObject)judgedObject.HitObject; var maniaObject = (ManiaHitObject)judgedObject.HitObject;
int columnIndex = maniaObject.Column - ColumnStartIndex; int columnIndex = maniaObject.Column - firstColumnIndex;
columns[columnIndex].OnJudgement(judgedObject, judgement); Columns[columnIndex].OnJudgement(judgedObject, judgement);
judgements.Clear(); judgements.Clear();
judgements.Add(new DrawableManiaJudgement(judgement) judgements.Add(new DrawableManiaJudgement(judgement)
@ -187,11 +199,6 @@ namespace osu.Game.Rulesets.Mania.UI
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
for (int i = 0; i < columns.Count; i++)
{
columns[i].IsSpecial = isSpecialColumn(i);
}
normalColumnColours = new List<Color4> normalColumnColours = new List<Color4>
{ {
colours.RedDark, colours.RedDark,
@ -221,12 +228,11 @@ namespace osu.Game.Rulesets.Mania.UI
} }
} }
protected override void Update() protected override void Update()
{ {
// Due to masking differences, it is not possible to get the width of the columns container automatically // Due to masking differences, it is not possible to get the width of the columns container automatically
// While masking on effectively only the Y-axis, so we need to set the width of the bar line container manually // While masking on effectively only the Y-axis, so we need to set the width of the bar line container manually
content.Width = columns.Width; content.Width = columnFlow.Width;
} }
} }
} }