Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use Samples instead of NodeSamples in Slides #545

Merged
merged 1 commit into from
Jan 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ private SentakkiHitObject convertSlider(HitObject original)
},
Lane = lane.NormalizePath(),
StartTime = original.StartTime,
NodeSamples = nodeSamples,
Samples = nodeSamples.FirstOrDefault(),
Break = headBreak
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ private SentakkiHitObject createTouchNote(HitObject original)
},
Lane = noteLane,
StartTime = original.StartTime,
NodeSamples = samples,
Samples = samples.FirstOrDefault(),
Break = hasBreakHead
};
}
Expand Down
4 changes: 4 additions & 0 deletions osu.Game.Rulesets.Sentakki/Objects/Drawables/DrawableSlide.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ private void load()
}
});
}
protected override void LoadSamples()
{
// The slide parent object doesn't need a sample
}

protected override void CheckForResult(bool userTriggered, double timeOffset)
{
Expand Down
4 changes: 1 addition & 3 deletions osu.Game.Rulesets.Sentakki/Objects/Slide.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ public double Duration
set => throw new NotSupportedException();
}

public IList<IList<HitSampleInfo>> NodeSamples = new List<IList<HitSampleInfo>>();

public double EndTime => StartTime + Duration;

public override Color4 DefaultNoteColour => Color4.Aqua;
Expand All @@ -45,7 +43,7 @@ protected override void CreateNestedHitObjects(CancellationToken cancellationTok
{
LaneBindable = { BindTarget = LaneBindable },
StartTime = StartTime,
Samples = NodeSamples.Any() ? NodeSamples.First() : new List<HitSampleInfo>(),
Samples = Samples,
Break = Break,
Ex = Ex
});
Expand Down
Loading