From 8aac1f50eea9127de3db49151fbea11dffd9274c Mon Sep 17 00:00:00 2001 From: AlFasGD Date: Tue, 22 May 2018 09:12:22 +0300 Subject: [PATCH] Remove more dependencies --- .../Edit/ManiaEditRulesetContainer.cs | 61 ------------------- .../UI/ManiaRulesetContainer.cs | 2 +- 2 files changed, 1 insertion(+), 62 deletions(-) diff --git a/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs b/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs index 49c13044e9..442997f1f3 100644 --- a/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs +++ b/osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs @@ -5,14 +5,9 @@ using OpenTK; using osu.Framework.Allocation; using osu.Framework.Graphics.Cursor; using osu.Game.Beatmaps; -using osu.Game.Beatmaps.ControlPoints; -using osu.Game.Rulesets.Edit; using osu.Game.Rulesets.Mania.UI; -using osu.Game.Rulesets.Objects.Types; using osu.Game.Rulesets.UI; using osu.Game.Screens.Edit.Screens.Compose; -using System.Collections.Generic; -using System.Linq; namespace osu.Game.Rulesets.Mania.Edit { @@ -20,8 +15,6 @@ namespace osu.Game.Rulesets.Mania.Edit { public BindableBeatDivisor BeatDivisor; - public List EditSnapLines; - public ManiaEditRulesetContainer(Ruleset ruleset, WorkingBeatmap beatmap, BindableBeatDivisor beatDivisor) : base(ruleset, beatmap) { @@ -37,60 +30,6 @@ namespace osu.Game.Rulesets.Mania.Edit public void OnBeatSnapDivisorChange(int newDivisor) { - generateEditSnapLines(newDivisor); - } - - private void generateEditSnapLines(int newDivisor) - { - // Generate the edit lines - double lastObjectTime = (Objects.LastOrDefault() as IHasEndTime)?.EndTime ?? Objects.LastOrDefault()?.StartTime ?? double.MaxValue; - - var timingPoints = Beatmap.ControlPointInfo.TimingPoints; - EditSnapLines = new List(); - - // Create lines before the beginning of the first timing point - if (timingPoints.Any()) - { - double step = timingPoints[0].BeatLength / newDivisor; - int index = (int)(timingPoints[0].Time / step); - index += newDivisor - index % newDivisor - 1; - for (double t = timingPoints[0].Time - step; t >= 0; t -= step, index--) - { - EditSnapLines.Add(new EditSnapLine - { - StartTime = t, - ControlPoint = timingPoints[0], - BeatDivisor = BeatDivisor, - BeatIndex = index, - }); - } - } - - for (int i = 0; i < timingPoints.Count; i++) - { - TimingControlPoint point = timingPoints[i]; - - // Stop 1ms before the end of the timing point before the next one if any, otherwise stop at the last object's time - double endTime = i < timingPoints.Count - 1 ? timingPoints[i + 1].Time - 1 : lastObjectTime + point.BeatLength * (int)point.TimeSignature; - - int index = 0; - double step = point.BeatLength / newDivisor; - for (double t = timingPoints[i].Time; t <= endTime; t += step, index++) - { - EditSnapLines.Add(new EditSnapLine - { - StartTime = t, - ControlPoint = point, - BeatDivisor = BeatDivisor, - BeatIndex = index, - }); - } - } - - var editPlayfield = (ManiaEditPlayfield)Playfield; - - editPlayfield.ClearEditSnapLines(); - EditSnapLines.ForEach(editPlayfield.Add); } protected override Playfield CreatePlayfield() => new ManiaEditPlayfield(Beatmap.Stages); diff --git a/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs b/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs index 7123aab901..6618125176 100644 --- a/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs +++ b/osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs @@ -73,7 +73,7 @@ namespace osu.Game.Rulesets.Mania.UI BarLines.ForEach(Playfield.Add); } - protected sealed override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages) + protected override Playfield CreatePlayfield() => new ManiaPlayfield(Beatmap.Stages) { Anchor = Anchor.Centre, Origin = Anchor.Centre,