Remove beatmap argument in Note

This commit is contained in:
Justus Franklin Tumacder
2021-04-24 19:30:16 +08:00
parent 7e3a611f95
commit f9905ebe68
32 changed files with 99 additions and 183 deletions

View File

@ -17,8 +17,6 @@ namespace osu.Game.Rulesets.Mania.Objects
/// </summary>
public class HoldNote : ManiaHitObject, IHasDuration
{
public IBeatmap Beatmap;
public double EndTime
{
get => StartTime + Duration;
@ -86,11 +84,6 @@ namespace osu.Game.Rulesets.Mania.Objects
/// </summary>
private double tickSpacing = 50;
public HoldNote(IBeatmap beatmap) : base()
{
Beatmap = beatmap;
}
protected override void ApplyDefaultsToSelf(ControlPointInfo controlPointInfo, BeatmapDifficulty difficulty)
{
base.ApplyDefaultsToSelf(controlPointInfo, difficulty);
@ -105,14 +98,14 @@ namespace osu.Game.Rulesets.Mania.Objects
createTicks(cancellationToken);
AddNested(Head = new Note(Beatmap)
AddNested(Head = new Note
{
StartTime = StartTime,
Column = Column,
Samples = GetNodeSamples(0),
});
AddNested(Tail = new TailNote(Beatmap)
AddNested(Tail = new TailNote
{
StartTime = EndTime,
Column = Column,

View File

@ -28,9 +28,8 @@ namespace osu.Game.Rulesets.Mania.Objects
set => SnapBindable.Value = value;
}
public Note(IBeatmap beatmap) : base()
public Note()
{
Beatmap = beatmap;
this.StartTimeBindable.BindValueChanged(_ => SnapToBeatmap(), true);
}

View File

@ -1,7 +1,6 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Game.Beatmaps;
using osu.Game.Rulesets.Judgements;
using osu.Game.Rulesets.Mania.Judgements;
@ -9,10 +8,6 @@ namespace osu.Game.Rulesets.Mania.Objects
{
public class TailNote : Note
{
public TailNote(IBeatmap beatmap) : base(beatmap)
{
}
public override Judgement CreateJudgement() => new ManiaJudgement();
}
}