h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-03 22:02:57 +08:00
Code Issues Releases Wiki Activity

Refactor addition of hitobjects

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

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

@ -9,9 +9,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Framework.Configuration; using osu.Framework.Configuration;
using osu.Game.Rulesets.Judgements; using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Game.Rulesets.Mania.Beatmaps; using osu.Game.Rulesets.Mania.Beatmaps;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
@ -36,18 +35,18 @@ namespace osu.Game.Rulesets.Mania.UI
public List<Column> Columns => stages.SelectMany(x => x.Columns).ToList(); public List<Column> Columns => stages.SelectMany(x => x.Columns).ToList();
public ManiaPlayfield(List<StageDefinition> stageDefinition) public ManiaPlayfield(List<StageDefinition> stageDefinitions)
: base(ScrollingDirection.Up) : base(ScrollingDirection.Up)
{ {
if (stageDefinition == null) if (stageDefinitions == null)
throw new ArgumentNullException(nameof(stageDefinition)); throw new ArgumentNullException(nameof(stageDefinitions));
if (stageDefinition.Count <= 0) if (stageDefinitions.Count <= 0)
throw new ArgumentException("Can't have zero or fewer stages."); throw new ArgumentException("Can't have zero or fewer stages.");
Inverted.Value = true; Inverted.Value = true;
var stageSpacing = 300 / stageDefinition.Count; var stageSpacing = 300 / stageDefinitions.Count;
InternalChildren = new Drawable[] InternalChildren = new Drawable[]
{ {
@ -63,9 +62,9 @@ namespace osu.Game.Rulesets.Mania.UI
}; };
int firstColumnIndex = 0; int firstColumnIndex = 0;
for (int i = 0; i < stageDefinition.Count; i++) for (int i = 0; i < stageDefinitions.Count; i++)
{ {
var newStage = new ManiaStage(i, firstColumnIndex, stageDefinition[i]); var newStage = new ManiaStage(i, firstColumnIndex, stageDefinitions[i]);
newStage.SpecialColumn.BindTo(SpecialColumnPosition); newStage.SpecialColumn.BindTo(SpecialColumnPosition);
newStage.VisibleTimeRange.BindTo(VisibleTimeRange); newStage.VisibleTimeRange.BindTo(VisibleTimeRange);
newStage.Inverted.BindTo(Inverted); newStage.Inverted.BindTo(Inverted);
@ -77,27 +76,9 @@ namespace osu.Game.Rulesets.Mania.UI
} }
} }
public override void OnJudgement(DrawableHitObject judgedObject, Judgement judgement) public override void Add(DrawableHitObject h) => getStageByColumn(((ManiaHitObject)h.HitObject).Column).Add(h);
{
var maniaObject = (ManiaHitObject)judgedObject.HitObject;
int column = maniaObject.Column;
getStageByColumn(column).AddJudgement(judgedObject, judgement);
}
public override void Add(DrawableHitObject h) public void Add(BarLine barline) => stages.ForEach(s => s.Add(barline));
{
int column = ((ManiaHitObject)h.HitObject).Column;
var stage = getStageByColumn(column);
stage.Add(h);
}
public void Add(BarLine barline)
{
foreach (var single in stages)
{
single.HitObjects.Add(new DrawableBarLine(barline));
}
}
private ManiaStage getStageByColumn(int column) private ManiaStage getStageByColumn(int column)
{ {
@ -106,9 +87,7 @@ namespace osu.Game.Rulesets.Mania.UI
{ {
sum = sum + stage.Columns.Count; sum = sum + stage.Columns.Count;
if (sum > column) if (sum > column)
{
return stage; return stage;
}
} }
return null; return null;

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

@ -13,6 +13,7 @@ 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.Beatmaps;
using osu.Game.Rulesets.Mania.Objects; using osu.Game.Rulesets.Mania.Objects;
using osu.Game.Rulesets.Mania.Objects.Drawables;
using osu.Game.Rulesets.Objects.Drawables; using osu.Game.Rulesets.Objects.Drawables;
using osu.Game.Rulesets.UI.Scrolling; using osu.Game.Rulesets.UI.Scrolling;
using OpenTK; using OpenTK;
@ -178,11 +179,14 @@ namespace osu.Game.Rulesets.Mania.UI
public override void Add(DrawableHitObject h) public override void Add(DrawableHitObject h)
{ {
int columnIndex = ((ManiaHitObject)h.HitObject).Column - firstColumnIndex; var maniaObject = (ManiaHitObject)h.HitObject;
int columnIndex = maniaObject.Column - firstColumnIndex;
Columns.ElementAt(columnIndex).Add(h); Columns.ElementAt(columnIndex).Add(h);
} }
public void AddJudgement(DrawableHitObject judgedObject, Judgement judgement) public void Add(BarLine barline) => base.Add(new DrawableBarLine(barline));
public override void OnJudgement(DrawableHitObject judgedObject, Judgement judgement)
{ {
var maniaObject = (ManiaHitObject)judgedObject.HitObject; var maniaObject = (ManiaHitObject)judgedObject.HitObject;
int columnIndex = maniaObject.Column - firstColumnIndex; int columnIndex = maniaObject.Column - firstColumnIndex;