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

Make SpecialColumnPosition only have an effect during load().

Browse Source
This commit is contained in:
smoogipooo 2017-05-04 15:12:32 +09:00
parent a2bdd020e5
commit e307b6d563
2 changed files with 18 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
osu.Desktop.VisualTests/Tests/TestCaseManiaPlayfield.cs
View File

@ -7,6 +7,7 @@ using osu.Framework.Testing;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Rulesets.Mania.UI; using osu.Game.Rulesets.Mania.UI;
using System.Linq; using System.Linq;
using System;
namespace osu.Desktop.VisualTests.Tests namespace osu.Desktop.VisualTests.Tests
{ {
@ -22,27 +23,31 @@ namespace osu.Desktop.VisualTests.Tests
const int max_columns = 10; const int max_columns = 10;
Action<int, SpecialColumnPosition> createPlayfield = (cols, pos) =>
{
Clear();
Add(new ManiaPlayfield(cols)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
SpecialColumnPosition = pos
});
};
for (int i = 1; i <= max_columns; i++) for (int i = 1; i <= max_columns; i++)
{ {
int tempI = i; int tempI = i;
AddStep($"{i} column" + (i > 1 ? "s" : ""), () => AddStep($"{i} column" + (i > 1 ? "s" : ""), () => createPlayfield(tempI, SpecialColumnPosition.Normal));
{
Clear();
Add(new ManiaPlayfield(tempI)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre
});
});
AddStep("Trigger keys down", () => ((ManiaPlayfield)Children.First()).Columns.Children.ForEach(triggerKeyDown)); AddStep("Trigger keys down", () => ((ManiaPlayfield)Children.First()).Columns.Children.ForEach(triggerKeyDown));
AddStep("Trigger keys up", () => ((ManiaPlayfield)Children.First()).Columns.Children.ForEach(triggerKeyUp)); AddStep("Trigger keys up", () => ((ManiaPlayfield)Children.First()).Columns.Children.ForEach(triggerKeyUp));
AddStep("Left special style", () => ((ManiaPlayfield)Children.First()).SpecialColumnPosition = SpecialColumnPosition.Left);
AddStep("Right special style", () => ((ManiaPlayfield)Children.First()).SpecialColumnPosition = SpecialColumnPosition.Right); AddStep("Left special style", () => createPlayfield(tempI, SpecialColumnPosition.Left));
AddStep("Right special style", () => createPlayfield(tempI, SpecialColumnPosition.Right));
} }
AddStep("Normal special style", () => ((ManiaPlayfield)Children.First()).SpecialColumnPosition = SpecialColumnPosition.Normal); AddStep("Normal special style", () => createPlayfield(max_columns, SpecialColumnPosition.Normal));
} }
private void triggerKeyDown(Column column) private void triggerKeyDown(Column column)

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

@ -27,25 +27,10 @@ namespace osu.Game.Rulesets.Mania.UI
/// </summary> /// </summary>
private static readonly Key[] default_keys = { Key.A, Key.S, Key.D, Key.F, Key.J, Key.K, Key.L, Key.Semicolon }; private static readonly Key[] default_keys = { Key.A, Key.S, Key.D, Key.F, Key.J, Key.K, Key.L, Key.Semicolon };
private SpecialColumnPosition specialColumnPosition;
/// <summary> /// <summary>
/// The style to use for the special column. /// The style to use for the special column.
/// </summary> /// </summary>
public SpecialColumnPosition SpecialColumnPosition public SpecialColumnPosition SpecialColumnPosition;
{
get { return specialColumnPosition; }
set
{
if (specialColumnPosition == value)
return;
specialColumnPosition = value;
if (!IsLoaded)
return;
updateColumnStyle();
}
}
public readonly FlowContainer<Column> Columns; public readonly FlowContainer<Column> Columns;
@ -103,14 +88,6 @@ namespace osu.Game.Rulesets.Mania.UI
specialColumnColour = colours.BlueDark; specialColumnColour = colours.BlueDark;
updateColumnStyle();
}
/// <summary>
/// Updates the column style (special style/colours) + keys.
/// </summary>
private void updateColumnStyle()
{
// Set the special column + colour + key // Set the special column + colour + key
for (int i = 0; i < columnCount; i++) for (int i = 0; i < columnCount; i++)
{ {