sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 16:59:53 +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
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)
: base(ScrollingDirection.Up)
{
if (stageDefinition ==null)
throw new ArgumentNullException();
if (stageDefinition == null)
throw new ArgumentNullException(nameof(stageDefinition));
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;
@ -62,32 +62,18 @@ namespace osu.Game.Rulesets.Mania.UI
}
};
var currentAction = ManiaAction.Key1;
int stageIndex = 0;
foreach (var stage in stageDefinition)
int firstColumnIndex = 0;
for (int i = 0; i < stageDefinition.Count; i++)
{
var drawableStage = new ManiaStage();
drawableStage.SpecialColumn.BindTo(SpecialColumnPosition);
drawableStage.VisibleTimeRange.BindTo(VisibleTimeRange);
drawableStage.Inverted.BindTo(Inverted);
drawableStage.ColumnStartIndex = stageIndex;
var newStage = new ManiaStage(i, firstColumnIndex, stageDefinition[i]);
newStage.SpecialColumn.BindTo(SpecialColumnPosition);
newStage.VisibleTimeRange.BindTo(VisibleTimeRange);
newStage.Inverted.BindTo(Inverted);
stages.Add(drawableStage);
AddNested(drawableStage);
stages.Add(newStage);
AddNested(newStage);
for (int i = 0; i < stage.Columns; i++)
{
var c = new Column
{
//c.Action = c.IsSpecial ? ManiaAction.Special : currentAction++;
Action = currentAction++
};
drawableStage.AddColumn(c);
}
stageIndex = stageIndex + stage.Columns;
firstColumnIndex += newStage.Columns.Count;
}
}
@ -95,7 +81,7 @@ namespace osu.Game.Rulesets.Mania.UI
{
var maniaObject = (ManiaHitObject)judgedObject.HitObject;
int column = maniaObject.Column;
getStageByColumn(column).AddJudgement(judgedObject,judgement);
getStageByColumn(column).AddJudgement(judgedObject, judgement);
}
public override void Add(DrawableHitObject h)
@ -118,7 +104,7 @@ namespace osu.Game.Rulesets.Mania.UI
int sum = 0;
foreach (var stage in stages)
{
sum = sum + stage.Columns.Count();
sum = sum + stage.Columns.Count;
if (sum > column)
{
return stage;